diff --git a/devops-client/lib/devops-client/handler/image.rb b/devops-client/lib/devops-client/handler/image.rb
index 3ee06d0..9fdc0d0 100644
--- a/devops-client/lib/devops-client/handler/image.rb
+++ b/devops-client/lib/devops-client/handler/image.rb
@@ -15,7 +15,6 @@ class Image < Handler
   end
 
   def handle
-    current_command = ARGV[1].to_sym
     @options, @args = @options_parser.parse_options_for!(current_command)
     case current_command
     when :list
diff --git a/devops-service/db/validators/base.rb b/devops-service/db/validators/base.rb
index 6e3b488..0cb68f9 100644
--- a/devops-service/db/validators/base.rb
+++ b/devops-service/db/validators/base.rb
@@ -9,6 +9,7 @@ module Validators
     def validate!
       raise InvalidRecord.new(message) unless valid?
     rescue StandardError => e
+      puts [e.message, e.backtrace].join("\n")
       raise InvalidRecord.new("An error raised during validation with #{self.class}: #{e.class}: #{e.message}")
     end
 
diff --git a/devops-service/db/validators/field_validators/provider_account.rb b/devops-service/db/validators/field_validators/provider_account.rb
index 3d56074..bd72486 100644
--- a/devops-service/db/validators/field_validators/provider_account.rb
+++ b/devops-service/db/validators/field_validators/provider_account.rb
@@ -1,11 +1,12 @@
 require_relative "base"
 
+
 module Validators
   module FieldValidator
     class ProviderAccount < Base
 
       def valid?
-        accounts = AccountsFactory.accounts(@model.provider)
+        accounts = ::Provider::AccountsFactory.accounts(@model.provider)
         accounts.map{|a| a.account_name}.include?(@value)
       end
 
diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index dbb5d6b..609186b 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -56,7 +56,7 @@ module Provider
     end
 
     def groups filters={}
-      g = self.compute.describe_security_groups(filters)
+      g = self.compute.describe_security_groups(filters || {})
       convert_groups(g.body["securityGroupInfo"])
     end