Base Controller and exception changes