CRAFTERCMS-756: handled error cases