diff --git a/gradle.properties b/gradle.properties
index ed57e3c..9a6a1f0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=se.transmode.gradle
-version=1.2
+version=1.2.1
 
 # use gradle daemon by default
 org.gradle.daemon = true
diff --git a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerTask.groovy b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerTask.groovy
index 4731a38..e4e5cc8 100644
--- a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerTask.groovy
+++ b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerTask.groovy
@@ -18,6 +18,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.Files
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.api.tasks.TaskAction
@@ -115,10 +116,7 @@ class DockerTask extends DefaultTask {
             target = new File(stageDir, source.name)
         }
         stageBacklog.add { ->
-            project.copy {
-                from source
-                into target
-            }
+            ant.copy(file: source.absolutePath,toDir: target.absolutePath)
         }
         instructions.add("ADD ${source.name} ${destination}")
     }
diff --git a/src/main/groovy/se/transmode/gradle/plugins/docker/client/NativeDockerClient.groovy b/src/main/groovy/se/transmode/gradle/plugins/docker/client/NativeDockerClient.groovy
index fa20aa7..e7c6b15 100644
--- a/src/main/groovy/se/transmode/gradle/plugins/docker/client/NativeDockerClient.groovy
+++ b/src/main/groovy/se/transmode/gradle/plugins/docker/client/NativeDockerClient.groovy
@@ -43,11 +43,14 @@ class NativeDockerClient implements DockerClient {
 
     private static String executeAndWait(String cmdLine) {
         def process = cmdLine.execute()
-        process.waitFor()
+        // wait for process, displaying stdout and stderr
+        process.waitForProcessOutput(System.out,System.err)
+
         if (process.exitValue()) {
-            throw new GradleException("Docker execution failed\nCommand line [${cmdLine}] returned:\n${process.err.text}")
+            throw new GradleException("Docker execution failed\nCommand line [${cmdLine}]")
         }
-        return process.in.text
+
+        return "Done"
     }
 
 }