Initial setup / error reporting improvements