Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/file-storage/www/file-add.tcl	2 Jan 2016 20:13:30 -0000	1.20.2.2
+++ openacs-4/packages/file-storage/www/file-add.tcl	8 May 2016 10:19:35 -0000	1.20.2.3
@@ -30,7 +30,7 @@
 		return
 	    }
 	}
-	if {![fs_folder_p $folder_id]} {
+        if {![info exists folder_id] || ![fs_folder_p $folder_id]} {
 	    ad_complain "The specified parent folder is not valid."
 	}
     }