[PDI-11848] - Changing Booleans to booleans to avoid many null checks, npes, added error message that was missing