More work on exception handling