Fixing NPE for bugzilla 118