rt45804 contains the suggested fix, please review.  Tweaks to the
printed error message are welcome.