Added some more exception support