add more exception handling