diff --git a/src/cloud/common/CloudServer.rb b/src/cloud/common/CloudServer.rb
index a957923f27..8b4b749dc6 100755
--- a/src/cloud/common/CloudServer.rb
+++ b/src/cloud/common/CloudServer.rb
@@ -113,10 +113,11 @@ class CloudServer
     # metadata:: Additional metadata for the file
     # [return] _Image_ Newly created image object
     def add_image(image, file=nil)
+        template = image.to_one_template
+        
         if file
             if file[:tempfile]
                 file_path = file[:tempfile].path
-                template = image.to_one_template
                 template << "\nPATH = #{file_path}"
             else
                 error_msg = "Image not present, aborting."
@@ -127,7 +128,7 @@ class CloudServer
 
         rc = @img_repo.create(image, template)
 
-        file[:tempfile].unlink
+        file[:tempfile].unlink if file
 
         if OpenNebula.is_error?(rc)
            return rc
diff --git a/src/oca/ruby/OpenNebula/ImageRepository.rb b/src/oca/ruby/OpenNebula/ImageRepository.rb
index a3fcb4cfd0..cb68350439 100644
--- a/src/oca/ruby/OpenNebula/ImageRepository.rb
+++ b/src/oca/ruby/OpenNebula/ImageRepository.rb
@@ -1,5 +1,6 @@
 require 'OpenNebula/Image'
 require 'fileutils'
+require 'CommandManager'
 
 module OpenNebula