throw errors, don't just echo them
Merge branch 'dev_moodle25'