Removed the exception logic when no entity is found for query