Improved GraceHandler.