Bug 1036459 - Null checking.
Bug 1036459. r=nalexander