Entity not found localization. Partially addresses #59