fixed #224
fixed 208; error propagates up, and early