diff --git a/client b/client
index da6d0fb..5453934 100644
--- a/client
+++ b/client
@@ -37,17 +37,17 @@ while true do
             if data[1] == 'eval' then
                 local cmd_fn, err = loadstring(data[2])
                 if not cmd_fn then
-                    print("Compile error: " .. err)
-                    rednet.send(master, "Compile error: " .. err)
+                    print("Failed to compile '" .. data[2] .. "': " .. err)
+                    rednet.send(master, "Failed to compile '" .. data[2] .. "': " .. err)
                 else
                     local success, output = pcall(cmd_fn)
                     if success then
                         if output then
-                            print("Command output: " .. dump(output))
-                            rednet.send(master, "Command output: " .. dump(output))
+                            print("Command output from '" .. data[2] .. "': " .. dump(output))
+                            rednet.send(master, "Command output from '" .. data[2] .. "': " .. dump(output))
                         else
-                            print("There is no command output.")
-                            rednet.send(master, "There is no command output.")
+                            print("There is no command output from '" .. data[2] .. "'")
+                            rednet.send(master, "There is no command output from '" .. data[2] .. "'")
                         end
                     else
                         print("Runtime error: " .. output)