small handler fixes, 

Should fix #388

And a bit of noise and trouble introduced in the #379 PR pile