A bit of code cleanup and increased protection if object deserializer returns nil