more exception handling modifications.