Bug with default settings fixed, redundant null checks removed
#SCL-5844: Fixed