diff --git a/freqtrade/main.py b/freqtrade/main.py
index d984ff487..0a2adf71a 100755
--- a/freqtrade/main.py
+++ b/freqtrade/main.py
@@ -38,9 +38,12 @@ def main(sysargv: List[str] = None) -> None:
         else:
             # No subcommand was issued.
             raise OperationalException(
-                "Usage of freqtrade requires a subcommand.\n"
-                "To use the previous behaviour, run freqtrade with `freqtrade trade [...]`.\n"
-                "To see a full list of options, please use `freqtrade --help`"
+                "Usage of Freqtrade requires a subcommand to be specified.\n"
+                "To have the previous behavior (bot executing trades in live/dry-run modes, "
+                "depending on the value of the `dry_run` setting in the config), run freqtrade "
+                "as `freqtrade trade [options...]`.\n"
+                "To see the full list of options available, please use "
+                "`freqtrade --help` or `freqtrade <command> --help`."
                 )
 
     except SystemExit as e:
diff --git a/tests/test_main.py b/tests/test_main.py
index dac960886..4e97c375d 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -18,7 +18,7 @@ from tests.conftest import (log_has, log_has_re, patch_exchange,
 def test_parse_args_None(caplog) -> None:
     with pytest.raises(SystemExit):
         main([])
-    assert log_has_re(r"Usage of freqtrade requires a subcommand\.", caplog)
+    assert log_has_re(r"Usage of Freqtrade requires a subcommand.*", caplog)
 
 
 def test_parse_args_backtesting(mocker) -> None: