Fixes. Better error reporting.