Index: matrix/tool/src/java/org/theospi/portfolio/matrix/control/ImportScaffoldingController.java
===================================================================
--- matrix/tool/src/java/org/theospi/portfolio/matrix/control/ImportScaffoldingController.java	(revision 110318)
+++ matrix/tool/src/java/org/theospi/portfolio/matrix/control/ImportScaffoldingController.java	(working copy)
@@ -66,10 +66,15 @@
             session.getAttribute(FilePickerHelper.FILE_PICKER_ATTACHMENTS) != null) {
 
          List refs = (List)session.getAttribute(FilePickerHelper.FILE_PICKER_ATTACHMENTS);
-         Reference ref = (Reference)refs.get(0);
-         scaffoldingForm.setUploadedScaffolding(ref);
-         Node file = getMatrixManager().getNode(ref);
-         scaffoldingForm.setScaffoldingFileName(file.getDisplayName());
+         if (refs.size() == 1) {
+            Reference ref = (Reference)refs.get(0);
+            scaffoldingForm.setUploadedScaffolding(ref);
+            Node file = getMatrixManager().getNode(ref);
+            scaffoldingForm.setScaffoldingFileName(file.getDisplayName());
+         } else {
+            scaffoldingForm.setUploadedScaffolding(null);
+            scaffoldingForm.setScaffoldingFileName(null);
+         }
       }
 
       session.removeAttribute(FilePickerHelper.FILE_PICKER_ATTACHMENTS);