2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 772e0a752db..30370126609 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-28  Ulf Jasper  <ulf.jasper@web.de>
+
+        * net/newst-treeview.el (newsticker--treeview-load): Take care of
+        nil value for `newsticker-groups-filename'.
+
 2014-11-28  Daiki Ueno  <ueno@gnu.org>
 
         * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 94661922cab..30015f499ef 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -1275,7 +1275,8 @@ Note: does not update the layout."
               (concat newsticker-dir "/groups")))
          (buf (and (file-exists-p filename)
                    (find-file-noselect filename))))
-    (and (file-exists-p newsticker-groups-filename)
+    (and newsticker-groups-filename
+         (file-exists-p newsticker-groups-filename)
          (y-or-n-p (format
                     (concat "Delete the file \"%s\",\nto which the obsolete "
                             "variable `newsticker-groups-filename' points ? ")