Add couple of missing Null checks For https://bugzilla.gnome.org/show_bug.cgi?id=733710 Reported by Gaurav but with slightly different fixes
2014-07-26T21:04:54