Refractored suspension handler out of the exception handler lookup

Refractored suspension handler out of the exception handler lookup #976