diff --git a/cf-agent/cf-agent.c b/cf-agent/cf-agent.c
index a5b7e73da1..e3054b27ef 100644
--- a/cf-agent/cf-agent.c
+++ b/cf-agent/cf-agent.c
@@ -273,6 +273,10 @@ static PromiseResult DefaultVarPromiseWrapper(EvalContext *ctx, const Promise *p
 
 int main(int argc, char *argv[])
 {
+printf("CRAIG: cf-agent argc=%d\n", argc);
+for(int i=0; i<argc; i++) {
+  printf("CRAIG: argv[%d]='%s'\n", i, argv[i]);
+}
     SetupSignalsForAgent();
 #ifdef HAVE_LIBXML2
         xmlInitParser();
diff --git a/cf-serverd/server_common.c b/cf-serverd/server_common.c
index 916bbdffcc..817e6dc989 100644
--- a/cf-serverd/server_common.c
+++ b/cf-serverd/server_common.c
@@ -1761,10 +1761,10 @@ bool DoExec2(const EvalContext *ctx,
     /* STEP 5: RUN CFRUNCOMMAND. */
 
     snprintf(sendbuf, sendbuf_size,
-             "cf-serverd executing cfruncommand: %s\n",
+             "cf-serverd executing cfruncommand: '%s'\n",
              cmdbuf);
     SendTransaction(conn->conn_info, sendbuf, 0, CF_DONE);
-    Log(LOG_LEVEL_INFO, "%s", sendbuf);
+    Log(LOG_LEVEL_INFO, "'%s'", sendbuf);
 
     FILE *pp = cf_popen(cmdbuf, "r", true);
     if (pp == NULL)
diff --git a/libpromises/generic_agent.c b/libpromises/generic_agent.c
index 1995536703..51a6eb788b 100644
--- a/libpromises/generic_agent.c
+++ b/libpromises/generic_agent.c
@@ -2457,6 +2457,7 @@ pid_t ReadPID(char *filename)
 
 bool GenericAgentConfigParseArguments(GenericAgentConfig *config, int argc, char **argv)
 {
+printf("CRAIG ParseArg()\n");
     if (argc == 0)
     {
         return true;
@@ -2464,6 +2465,18 @@ bool GenericAgentConfigParseArguments(GenericAgentConfig *config, int argc, char
 
     if (argc > 1)
     {
+Log(LOG_LEVEL_ERR, "Special 1-arg <policy-file> expected, got %d arguments instead. See debug output for details.", argc);
+for (int i=0; i<argc; i++) {
+Log(LOG_LEVEL_ERR, "argv[%d]='%s'", i, argv[i]);
+char raw[2048] = "";
+for(int j=0; j<512; j++) {
+  char chunk[5];
+  snprintf(chunk, 5, "0x%02x ", argv[i][j]);
+  StringAppend(raw, chunk, 2048);
+  if (argv[i][j] == 0) break;
+}
+Log(LOG_LEVEL_DEBUG, "Too many args, argv[%d] is '%s' [%s]", i, argv[i], raw);
+}
         return false;
     }