--- a/master/slave_config.c	Tue Apr 14 09:33:24 2015 -0400
+++ b/master/slave_config.c	Tue Apr 14 09:34:15 2015 -0400
@@ -308,6 +308,10 @@
         list_for_each_entry(reg, &sc->reg_requests, list) {
             if (sc->slave->fsm.reg_request == reg) {
                 sc->slave->fsm.reg_request = NULL;
+                EC_SLAVE_WARN(sc->slave, "Aborting register request,"
+                        " slave is detaching.\n");
+                reg->state = EC_INT_REQUEST_FAILURE;
+                wake_up_all(&sc->slave->master->request_queue);
                 break;
             }
         }