For https://bugzilla.gnome.org/show_bug.cgi?id=755857 a case where we check for NULL but not everywhere