Better handling for missing properties