some more exception handling