CRAFTERCMS-214; CRAFTERCMS-201

CRAFTERCMS-201
Fixed spelling in error messages

CRAFTERCMS-214
Improved releasing resources.