Improves error message when entity is removed

[alex-kulakov]

Adds type of entity to the message. this helps to squeeze scope of code for investigation in case of problems.