Propogate errors correctly

quick fix, we're working on improving test coverage on another branch,
but get this working for now.
Fewer requires so autoloading works in dev mode

If files are explicitly required they don't appear to be tracked by the
autoloading mechanism and so don't get reloaded in development mode.