Prevent internal server error on invalid structure
Merge branch 'develop' of git://github.com/oat-sa/tao-core into develop