fix(undefined): provide further if-clauses

CAM-3006