diff --git a/classes/CommerceXlsImportImageHandler.inc b/classes/CommerceXlsImportImageHandler.inc
index cf5701c..c56a149 100644
--- a/classes/CommerceXlsImportImageHandler.inc
+++ b/classes/CommerceXlsImportImageHandler.inc
@@ -25,6 +25,7 @@ class CommerceXlsImportImageHandler extends CommerceXlsImportValueHandler implem
     $message = NULL;
 
     $image_path = CommerceXlsImportSettings::imagePath($filename);
+
     if (!$image_path) {
       $image_path = $file_directory . $filename;
     }
@@ -105,8 +106,10 @@ class CommerceXlsImportImageHandler extends CommerceXlsImportValueHandler implem
     $multivalue = (int) $field_info['cardinality'] !== 1;
     $file_names = ($multivalue) ? self::fromCsv($value) : array($value);
 
+
     $files = array();
     $messages = array();
+
     foreach ($file_names as $filename) {
       if (empty($filename)) {
         break;
@@ -120,7 +123,7 @@ class CommerceXlsImportImageHandler extends CommerceXlsImportValueHandler implem
         break;
       }
 
-      $file_uri = $file_destination . $filename;
+      $file_uri = $file_destination . basename($filename);
       if ($path = CommerceXlsImportSettings::imagePath($filename)) {
         $writable = file_prepare_directory($file_destination, FILE_CREATE_DIRECTORY|FILE_MODIFY_PERMISSIONS);
         if (!$writable) {
@@ -157,7 +160,6 @@ class CommerceXlsImportImageHandler extends CommerceXlsImportValueHandler implem
       else {
         $file = new stdClass();
       }
-
       $file->uid = $GLOBALS['user']->uid;
       $file->filename = $filename;
       $file->uri = $file_uri;
@@ -172,7 +174,7 @@ class CommerceXlsImportImageHandler extends CommerceXlsImportValueHandler implem
     //TODO, move this check up so as to not waste time?
     //the field could have an instance, but now be deleted and not be part of this wrapper anymore
     if(isset($wrapper->{$field_name})) {
-      $wrapper->{$field_name} = (!empty($files)) ? $files : NULL;
+      $wrapper->{$field_name} = (!empty($files)) ? $files : array();
     }
 
     return array(