diff --git a/src/octoprint/events.py b/src/octoprint/events.py
index eb500a01..6426011a 100644
--- a/src/octoprint/events.py
+++ b/src/octoprint/events.py
@@ -350,7 +350,10 @@ class CommandTrigger(GenericEventListener):
 				else:
 					commandExecutioner(command)
 			except subprocess.CalledProcessError as e:
-				self._logger.warn("Command failed with return code %i: %s" % (e.returncode, str(e)))
+				if debug:
+					self._logger.warn("Command failed with return code {}: {}".format(e.returncode, str(e)))
+				else:
+					self._logger.warn("Command failed with return code {}, enable debug logging on target 'octoprint.events' for details".format(e.returncode))
 			except:
 				self._logger.exception("Command failed")