Add some more exception handling