added a few more exception cases