Added error controller