diff --git a/python/mxnet/ndarray/ndarray.py b/python/mxnet/ndarray/ndarray.py
index 6c422ca14691..f7a99c2eb158 100644
--- a/python/mxnet/ndarray/ndarray.py
+++ b/python/mxnet/ndarray/ndarray.py
@@ -157,7 +157,11 @@ def waitall():
     """Wait for all async operations to finish in MXNet.
 
     This function is used for benchmarking only.
-    Rethrowing exceptions as part of mx.nd.waitall is not supported.
+. warning:: 
+    If your code has exceptions, `waitall` can cause silent failures.
+    For this reason you should avoid `waitall` in your code. 
+    Use it only if you are confident that your code is error free. 
+    Then make sure you call `wait_to_read` on all outputs after `waitall`.
     If your code has exceptions, waitall can cause silent failures.
     Avoid waitall in your code/precede it with wait_to_read for the outputs
     unless you are confident about your code not throwing an exception in