diff --git a/perl/Gnome-Tomboy/lib/Tomboy/Directory.pm b/perl/Gnome-Tomboy/lib/Tomboy/Directory.pm
index 1c48383be00e687a0c51d2b5b5222d08c264e1f0..b590c8d1401642b2e71666fe7bbff7b23943e503 100644
--- a/perl/Gnome-Tomboy/lib/Tomboy/Directory.pm
+++ b/perl/Gnome-Tomboy/lib/Tomboy/Directory.pm
@@ -176,7 +176,7 @@ print __LINE__, " scan_dir: quick=[$quick]\n";
   closedir (DIR);
 
 # TODO: list dropped/deleted files
-  print __LINE__, " fnm: ", Dumper (\%fnm);
+  # print __LINE__, " fnm: ", Dumper (\%fnm);
   foreach my $fp (keys %fnm)
   {
     print "DEL: ", $fp, "\n";
diff --git a/perl/Gnome-Tomboy/lib/Tomboy/Note/Simple.pm b/perl/Gnome-Tomboy/lib/Tomboy/Note/Simple.pm
index bd681030964a8cb7b87e0a3bc841c72522cebd51..c203ba2e446e258d4f9caf2bbb078eaeaf4eb8c0 100755
--- a/perl/Gnome-Tomboy/lib/Tomboy/Note/Simple.pm
+++ b/perl/Gnome-Tomboy/lib/Tomboy/Note/Simple.pm
@@ -549,13 +549,22 @@ sub save
 # print "tags: ", Dumper ($note->{'tags'});
   my @tags= ();
   push (@tags, 'system:template') if ($is_template);
-  if ($nb_list)
-  {
-    foreach my $nb_name (@$nb_list)
+
+print __LINE__, " nb_list=[$nb_list]\n";
+  if (scalar ($nb_list) eq 'ARRAY')
+  { # hmm... how can this be a list?
+    if ($nb_list)
     {
-      push (@tags, 'system:notebook:'. $nb_name)
+      foreach my $nb_name (@$nb_list)
+      {
+        push (@tags, 'system:notebook:'. $nb_name)
+      }
     }
   }
+  else
+  {
+    push (@tags, 'system:notebook:'. $nb_list)
+  }
 
   unless (defined ($fnm_out))
   {