Adding additional checks
Merge branch '3.2' of git://github.com/thecodingmachine/mvc.bce into 3.2