Added a stack sensitive version of the handler.