Bug 842151 - 'null' message breaks the threadUI
Merge remote-tracking branch 'bakulf/null_thread'