Updated/Added error handling for missing controller and view