diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index f120012af..2437fc878 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -99,7 +99,9 @@ public RC_T awaitCompletion() throws InterruptedException {
      *         before {@link ResultCallback#onComplete()} was called.
      */
     public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        return completed.await(timeout, timeUnit);
+        boolean result = completed.await(timeout, timeUnit);
+        getFirstError();
+        return result;
     }
 
     /**