put locking in try/catch
Merge branch 'master-solution' of https://github.com/bqreaders/chat-kata into master-solution