Issue #3533724 by jurgenhaas: Condition entity type and bundle needs to check for empty type

(cherry picked from commit ca09995d)

Co-authored-by: jurgenhaas juergen.haas@lakedrops.com

Closes #3536499