diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c
index fff9a2604..9fe9f72ae 100644
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@@ -282,7 +282,8 @@ static int gw_read_backend_event(DCB *dcb) {
                                 } /* switch */
                         }
 
-                        if (backend_protocol->state == MYSQL_AUTH_FAILED) {
+                        if (backend_protocol->state == MYSQL_AUTH_FAILED) 
+                        {
                                 /** 
                                  * protocol state won't change anymore, 
                                  * lock can be freed 
@@ -333,7 +334,7 @@ static int gw_read_backend_event(DCB *dcb) {
                                 
                                 if (session->state == SESSION_STATE_STOPPING)
                                 {
-                                        goto return_with_lock;
+                                        goto return_rc;
                                 }
                                 spinlock_acquire(&session->ses_lock);
                                 session->state = SESSION_STATE_STOPPING;