Better error reporting - submit issue
* #1044, #984