Be stricter about exceptions