diff --git a/lib/docker_client.rb b/lib/docker_client.rb
index ed5d20d5..b44191aa 100644
--- a/lib/docker_client.rb
+++ b/lib/docker_client.rb
@@ -186,7 +186,9 @@ class DockerClient
   end
 
   def self.destroy_container(container)
-    @socket.close
+    if @socket
+      @socket.close
+    end
     Rails.logger.info('destroying container ' + container.to_s)
     container.stop.kill
     container.port_bindings.values.each { |port| PortPool.release(port) }