handle 'message not found' exception
Merge branch 'master' of https://github.com/irene001/papercut
removed unnecessary code