Add a couple more exception handlings