NPE fix
Merge pull request #251 from Netflix/message-queue

NPE fix