Add error handling and place a lock over DM map updates#373

turt2live wants to merge 1 commit intomainturt2live/matrix-bot-sdk:mainfrom

travis/dms-catchturt2live/matrix-bot-sdk:travis/dms-catchCopy head branch name to clipboard