Issue #1979438 by blueminds: Integrate with exception handler 7.x-1.x.