well i feel sheepish.

always return the expectation message, not just when the handler doesn't
exist