diff --git a/docs/FAQ.md b/docs/FAQ.md
index cd1512317a..7f453f1468 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -89,6 +89,11 @@ There may be a number of possible causes:
   Unity Environment to figure what error happened.
 - _Cause_: You have assigned `HTTP_PROXY` and `HTTPS_PROXY` values in your
   environment variables. _Solution_: Remove these values and try again.
+- _Cause_: You are running in a headless environment (e.g. remotely connected
+  to a server). _Solution_: Pass `--no-graphics` to `mlagents-learn`, or
+  `no_graphics=True` to `RemoteRegistryEntry.make()` or the `UnityEnvironment`
+  initializer. If you need graphics for visual observations, you will need to
+  set up `xvfb` (or equivalent).
 
 ## Communication port {} still in use
 
diff --git a/ml-agents-envs/mlagents_envs/rpc_communicator.py b/ml-agents-envs/mlagents_envs/rpc_communicator.py
index be409fe324..ae118fe30d 100644
--- a/ml-agents-envs/mlagents_envs/rpc_communicator.py
+++ b/ml-agents-envs/mlagents_envs/rpc_communicator.py
@@ -96,7 +96,7 @@ def poll_for_timeout(self):
             raise UnityTimeOutException(
                 "The Unity environment took too long to respond. Make sure that :\n"
                 "\t The environment does not need user interaction to launch\n"
-                "\t The Agents are linked to the appropriate Brains\n"
+                '\t The Agents\' Behavior Parameters > Behavior Type is set to "Default"\n'
                 "\t The environment and the Python interface have compatible versions."
             )