Made default-on-error a little less bad.