diff --git a/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb b/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb
index bcf54ea99e..33cb080898 100644
--- a/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb
+++ b/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb
@@ -26,8 +26,10 @@ module OpenNebulaCloudAuth
 
             rc = user.info
             if OpenNebula.is_error?(rc)
-                logger.error { "User #{username} could not be authenticated" }
-                logger.error { rc.message }
+                if logger
+                    logger.error{ "User #{username} could not be authenticated"}
+                    logger.error { rc.message }
+                end
                 return nil 
             end
             
@@ -36,4 +38,4 @@ module OpenNebulaCloudAuth
 
         return nil
     end
-end
\ No newline at end of file
+end
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index fa5dd535c8..1017484767 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -87,7 +87,7 @@ enable_logging SUNSTONE_LOG, settings.config[:debug_level].to_i
 
 begin
     ENV["ONE_CIPHER_AUTH"] = SUNSTONE_AUTH
-    cloud_auth = CloudAuth.new(settings.config)
+    cloud_auth = CloudAuth.new(settings.config, settings.logger)
 rescue => e
     settings.logger.error {
         "Error initializing authentication system" }
@@ -120,8 +120,8 @@ helpers do
         begin
             result = settings.cloud_auth.auth(request.env, params)
         rescue Exception => e
-            error 500, ""
             logger.error { e.message }
+            return [500, ""]
         end
 
         if result.nil?