Return if entity is null
Minor additions/changes