diff --git a/lib/agent/actions.js b/lib/agent/actions.js
index <HASH>..<HASH> 100644
--- a/lib/agent/actions.js
+++ b/lib/agent/actions.js
@@ -38,8 +38,13 @@ var action_stopped = function(name) {
 }
 
 var start = function(type, name, opts, cb){
+  if (running[name]) {
+	var err = new Error('Already running: ' + name);
+	hooks.emit('error', err);
+	return cb && cb(err);
+  }
+  
   logger.info('Starting ' + type + ': '+ name);
-
   loader.load(type, name, function(err, action){
     if (err) return hooks.trigger('error', err);
Prevent running action from being started twice.