Correcting regression regarding then done/reject registration of handlers