Added missing exception handler methods.