Deleted class exists
Fixed exception message
Merge branch 'develop'