Initial work

What's the purpose of an empty finally block - seems redundant