Index: content-types/src/java/org/sakaiproject/content/types/FileUploadType.java
===================================================================
--- content-types/src/java/org/sakaiproject/content/types/FileUploadType.java	(revision 131705)
+++ content-types/src/java/org/sakaiproject/content/types/FileUploadType.java	(working copy)
@@ -199,9 +199,12 @@
 		
 		@Override
 		public boolean available(ContentEntity entity) {
-			boolean enabled = ServerConfigurationService.getBoolean(ContentHostingService.RESOURCES_ZIP_ENABLE, false) ||
-			ServerConfigurationService.getBoolean(ContentHostingService.RESOURCES_ZIP_ENABLE_EXPAND, false);
-			return enabled && entity.getId().toLowerCase().endsWith(".zip");
+			if(null == entity) return false;
+			else {
+				boolean enabled = ServerConfigurationService.getBoolean(ContentHostingService.RESOURCES_ZIP_ENABLE, false) ||
+				ServerConfigurationService.getBoolean(ContentHostingService.RESOURCES_ZIP_ENABLE_EXPAND, false);
+				return enabled && entity.getId().toLowerCase().endsWith(".zip");
+			}
 		}
 	}