Minor refactoring
Skips null objects when hydrating an entity object