added checking for missing properties