diff --git a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
index 8e22af1ec2..62ca8ca1c5 100644
--- a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
@@ -310,7 +310,10 @@ public class ImportWebsiteDialog
          }
          finally
          {
-            ImporterActionExecuter.deleteDir(tempDir);
+            if (tempDir.exists())
+            {
+               ImporterActionExecuter.deleteDir(tempDir);
+            }
          }
       }
       catch (IOException e)
@@ -330,6 +333,7 @@ public class ImportWebsiteDialog
       ServiceRegistry services = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
       MimetypeService mimetypeService = services.getMimetypeService();
       File topdir = new File(dir);
+      if (!topdir.exists()) return;
       for (File file : topdir.listFiles())
       {
          try
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index 0b33208dad..e4dfb7e70e 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -504,7 +504,7 @@ var MySpaces = {
       var panel = $E(".spaceCreateSpacePanel", $(actionEl).getParent());
       panel.setStyle("opacity", 0);
       panel.setStyle("display", "inline");
-      panel.getElementById("space-name").removeClass("spaceFormItemError");
+      panel.getElementsBySelector('#space-name').removeClass("spaceFormItemError");
 
       Alfresco.Dom.smartAlignElement(panel, panel.getParent());
       // make into a dragable panel
@@ -543,9 +543,9 @@ var MySpaces = {
       {
          if (spaceName.test(/(.*[\"\*\\\>\<\?\/\:\|]+.*)|(.*[\.]?.*[\.]+$)|(.*[ ]+$)/i))
          {
-            var spaceName = panel.getElementById("space-name");
-            spaceName.addClass("spaceFormItemError");
-            spaceName.focus();
+            // Different object access methods to workaround MSIE7 problem
+            panel.getElementsBySelector('#space-name').addClass("spaceFormItemError");
+            panel.getElementById("space-name").focus();
          }
          else
          {