diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 60a16218c7..fa3a1964d4 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -224,6 +224,8 @@ class DefaultCompletableFuture[T](timeout: Long) extends CompletableFuture[T] {
           wait = wait - (currentTimeInNanos - start)
       }
     }
+    if (!_value.isDefined)
+      throw new FutureTimeoutException("Futures timed out after [" + timeout + "] milliseconds")
     this
   } finally {
     _lock.unlock