Error controller stub and misc fixes