added check for entity being null