Fixed bug in handler returns code reported by agold1234