FIX: on error stop, not close