Fix missing error type in watch decode.

Only the 2nd commit is new to this PR.

Fixes (one) issue reported by daneyon_ in IRC.