Added more exception throwing to get two more of the tests running.