Fixed the last fix

null-check still needs to be in as well for other relevant properties