Intriguing, but irrelevant question
Adds one error message, a little cleanup too
Quick fix for improper transfer of inputs, more mess :/

- Someday my brain will work again