Added ErrorController
Added some stuff