Add support for more verbose error handling in startup
Merge branch 'more-verbose-startup-errors'