More work on exception catching