Add all hanging entities

Isn't it bad to just catch the Exception class?