diff --git a/devops-service/core/devops-application.rb b/devops-service/core/devops-application.rb
index d959418..cfe09d1 100644
--- a/devops-service/core/devops-application.rb
+++ b/devops-service/core/devops-application.rb
@@ -12,6 +12,10 @@ module Devops
       @@applications
     end
 
+    def self.root
+      File.expand_path(File.dirname(__FILE__) + '/..')
+    end
+
     def prepare
 
     end
diff --git a/devops-service/core/devops-service.rb b/devops-service/core/devops-service.rb
index fc9f8ad..a535e26 100644
--- a/devops-service/core/devops-service.rb
+++ b/devops-service/core/devops-service.rb
@@ -15,9 +15,9 @@ require "hooks"
 =end
 
 require_relative "devops-loader"
+require_relative "devops-application"
 require_relative "devops-db"
 require_relative "devops-logger"
-require_relative "devops-application"
 
 require "lib/knife/knife_factory"
 
diff --git a/devops-service/db/mongo/models/stack/stack_base.rb b/devops-service/db/mongo/models/stack/stack_base.rb
index eac4ad0..f4b0a9a 100644
--- a/devops-service/db/mongo/models/stack/stack_base.rb
+++ b/devops-service/db/mongo/models/stack/stack_base.rb
@@ -40,7 +40,8 @@ module Devops
           stack_template: stack_template,
           name: name,
           parameters: parameters,
-#          details: details,
+          # details are required to proper status handling
+          details: details,
           stack_status: stack_status,
           owner: owner
         }
diff --git a/devops-service/db/mongo/mongo_connector.rb b/devops-service/db/mongo/mongo_connector.rb
index 21fc251..7600562 100644
--- a/devops-service/db/mongo/mongo_connector.rb
+++ b/devops-service/db/mongo/mongo_connector.rb
@@ -2,8 +2,12 @@ require "mongo"
 require "forwardable"
 
 require "db/mongo/connectors/base"
-Dir["db/mongo/connectors/helpers/*.rb"].each {|file| require file }
-Dir["db/mongo/connectors/*.rb"].each {|file| require file }
+
+helpers_files = File.join(Devops::Application.root, "db/mongo/connectors/helpers/*.rb")
+Dir[helpers_files].each {|file| require file }
+
+connectors_files = File.join(Devops::Application.root, "db/mongo/connectors/*.rb")
+Dir[connectors_files].each {|file| require file }
 
 include Mongo
 
diff --git a/devops-service/providers/openstack.rb b/devops-service/providers/openstack.rb
index b551693..3a6d161 100644
--- a/devops-service/providers/openstack.rb
+++ b/devops-service/providers/openstack.rb
@@ -230,7 +230,11 @@ module Provider
     end
 
     def delete_stack(stack)
-      orchestration.delete_stack(Fog::Orchestration::OpenStack::Stack.new({'id' => stack.id, 'stack_name' => stack.name}))
+      begin
+        orchestration.delete_stack(Fog::Orchestration::OpenStack::Stack.new({'id' => stack.id, 'stack_name' => stack.name}))
+      rescue Fog::Compute::OpenStack::NotFound
+        puts 'already deleted'
+      end
     end
 
     def stack_details(stack)