diff --git a/src/Stmt.cc b/src/Stmt.cc
index c3309f9230..0edca90435 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -2072,7 +2072,7 @@ void WhenStmt::StmtDescribe(ODesc* d) const
 	wi->WhenBody()->Describe(d);
 	d->PopIndent();
 
-	if ( wi->TimeoutStmt() )
+	if ( wi->TimeoutExpr() )
 		{
 		if ( d->IsReadable() )
 			{
@@ -2087,7 +2087,10 @@ void WhenStmt::StmtDescribe(ODesc* d) const
 			d->PopIndent();
 			}
 		else
+			{
+			wi->TimeoutExpr()->Describe(d);
 			wi->TimeoutStmt()->Describe(d);
+			}
 		}
 	}