diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index c4f982b41..6121a0502 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -61,8 +61,9 @@
  * 31/07/2013	Massimiliano Pinto	Added a check for candidate server, if NULL return
  * 12/08/2013	Mark Riddoch		Log unsupported router options
  * 04/09/2013	Massimiliano Pinto	Added client NULL check in clientReply
- * 22/10/2013	Massimiliano Pinto	errorReply called from backend, for client error replyi
+ * 22/10/2013	Massimiliano Pinto	errorReply called from backend, for client error reply
  *					or take different actions such as open a new backend connection
+ * 20/02/2014	Massimiliano Pinto	If router_options=slave, route traffic to master if no slaves available
  *
  * @endverbatim
  */
@@ -283,6 +284,7 @@ ROUTER_INSTANCE	        *inst = (ROUTER_INSTANCE *)instance;
 ROUTER_CLIENT_SES       *client_rses;
 BACKEND                 *candidate = NULL;
 int                     i;
+int			master_host = -1;
 
         LOGIF(LD, (skygw_log_write_flush(
                 LOGFILE_DEBUG,
@@ -336,6 +338,16 @@ int                     i;
 				inst->bitmask)));
 		}
 
+		/*
+		 * If router_options=slave, get the running master
+ 		 * It will be used if there are no running slaves at all
+ 		 */
+		if (inst->bitvalue == SERVER_SLAVE) {
+			if (master_host < 0 && (SERVER_IS_MASTER(inst->servers[i]->server))) {
+				master_host = i;
+			}
+		}
+
 		if (inst->servers[i] &&
                     SERVER_IS_RUNNING(inst->servers[i]->server) &&
                     (inst->servers[i]->server->status & inst->bitmask) ==
@@ -368,15 +380,22 @@ int                     i;
 		}
 	}
 
-	/* no candidate server here, clean and return NULL */
+	/* There is no candidate server here!
+	 * With router_option=slave a master_host could be set, so route traffic there.
+	 * Otherwise, just clean up and return NULL
+	 */
 	if (!candidate) {
-                LOGIF(LE, (skygw_log_write_flush(
-                        LOGFILE_ERROR,
-                        "Error : Failed to create new routing session. "
-                        "Couldn't find eligible candidate server. Freeing "
-                        "allocated resources.")));
-		free(client_rses);
-		return NULL;
+		if (master_host >= 0) {
+			candidate = inst->servers[master_host];
+		} else {
+                	LOGIF(LE, (skygw_log_write_flush(
+                      	  LOGFILE_ERROR,
+                      	  "Error : Failed to create new routing session. "
+                      	  "Couldn't find eligible candidate server. Freeing "
+                       	 "allocated resources.")));
+			free(client_rses);
+			return NULL;
+		}
 	}
 
 	/*
@@ -673,9 +692,8 @@ errorReply(
         int     action)
 {
 	DCB		*client = NULL;
-	ROUTER_OBJECT   *router = NULL;
 	SESSION         *session = backend_dcb->session;
-	client = backend_dcb->session->client;
+	client = session->client;
 
 	ss_dassert(client != NULL);
 }