Fixing error messages
Merge branch '4.1' of git://github.com/thecodingmachine/mvc.splash-common into 4.1