diff --git a/ChangeLog b/ChangeLog
index c6095b10f0..164335f550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-13  Aurimas Juška  <aurisj@svn.gnome.org>
+
+	* app/unique.c (gimp_unique_win32_open): check for NULL pointer to
+	prevent crash when there are no filenames provided.
+
 2008-07-13  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/display/gimpdisplayshell.c (gimp_display_shell_new): Get rid
diff --git a/app/unique.c b/app/unique.c
index b31318cb93..2819c00c9d 100644
--- a/app/unique.c
+++ b/app/unique.c
@@ -193,7 +193,7 @@ gimp_unique_win32_open (const gchar **filenames,
       GError         *error = NULL;
       gint            i;
 	
-      for (i = 0; filenames[i]; i++)
+      for (i = 0; filenames && filenames[i]; i++)
 	{
 	  gchar *uri = gimp_unique_filename_to_uri (filenames[i], cwd, &error);