CRAFTERCMS-435: Error management improvement