Verified #78 - better error msgs