Enabled better error reporting