[WIP] Added exception handling for missing properties