Bug 1097997 - fixed null problem