With this exception block the other block is unnecessary - remove?