Bug 856848 - Fix thread crash r=ehugg,ekr