diff --git a/lib/vmpooler/providers/aws.rb b/lib/vmpooler/providers/aws.rb
index 7a105b7..f06870f 100644
--- a/lib/vmpooler/providers/aws.rb
+++ b/lib/vmpooler/providers/aws.rb
@@ -151,7 +151,7 @@ module Vmpooler
           vm_hash = nil
           begin
             vm_object = connection.get_instance(project, zone(pool_name), vm_name)
-          rescue ::Google::Apis::ClientError => e
+          rescue ::Aws::EC2::ClientError => e
             raise e unless e.status_code == 404
 
             # swallow the ClientError error 404 and return nil when the VM was not found
@@ -234,10 +234,8 @@ module Vmpooler
 
           debug_logger('trigger insert_instance')
           result = connection.create_instances(config)
-          wait_for_operation(project, pool_name, result)
-          created_instance = get_vm(pool_name, new_vmname)
-          dns_setup(created_instance)
-          created_instance
+#          created_instance = get_vm(pool_name, new_vmname          
+#          created_instance
         end
 
         # create_disk creates an additional disk for an existing VM. It will name the new
diff --git a/spec/unit/providers/aws_spec.rb b/spec/unit/providers/aws_spec.rb
index 8a5817d..3be5206 100644
--- a/spec/unit/providers/aws_spec.rb
+++ b/spec/unit/providers/aws_spec.rb
@@ -58,9 +58,9 @@ EOT
       let(:project) { 'vmpooler-test' }
       it 'gets a vm' do
         result = subject.create_vm(poolname, vmname)
-        #result = subject.destroy_vm(poolname, vmname)
-        subject.get_vm(poolname, vmname)
-        #subject.dns_teardown({'name' => vmname})
+        # result = subject.destroy_vm(poolname, vmname)
+        # subject.get_vm(poolname, vmname)
+        # subject.dns_teardown({'name' => vmname})
         # subject.dns_setup({'name' => vmname, 'ip' => '1.2.3.5'})
       end
     end