minor improvements to the the NOOP handler