CONN-911 Code review change, added finally block