Added more exception catching to some odd errors