- Make sure entity is valid before returning it