s/StandardError/Exception. Also removed a file I'd forgotten to remove before.