Implements @r-gaia-cs's suggestions about nicer handlers and messages