CRAFTERCMS-201
Fixed spelling in error messages
CRAFTERCMS-214
Improved releasing resources.
Merge remote-tracking branch 'origin/CRAFTERCMS-214'
Merge remote-tracking branch 'origin/CRAFTERCMS-201'