Make a few tweaks for error reporting and to make Sensio Labs Insights happier