CRAFTERCMS-94: Errors in logs.
Merge remote-tracking branch 'alvaro/master'