diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index 71c3483ec..517ef82dd 100755
--- a/BUILD/mdbci/copy_repos.sh
+++ b/BUILD/mdbci/copy_repos.sh
@@ -28,10 +28,17 @@ if [ "$box_type" == "RPM" ] ; then
                 cd $path_prefix/$platform
                 ln -s $platform_version "$platform_version"server
                 ln -s $platform_version "$platform_version"Server
+                cd ..
                 if [ "$platform" == "centos" ] ; then
-                        cd ..
                         ln -s centos rhel
                 fi
+                if [ "$platform" == "opensuse" ] ; then
+                        mkdir -p sles
+			cd sles
+                        ln -s ../opensuse/$platform_version $platform_version
+                        cd ..
+                fi
+
 
   eval "cat <<EOF
 $(<${script_dir}/templates/repository-config/rpm.json.template)
diff --git a/server/modules/routing/readwritesplit/rwsplitsession.cc b/server/modules/routing/readwritesplit/rwsplitsession.cc
index 25b1e7ac6..bac38aaad 100644
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@@ -1090,21 +1090,11 @@ void RWSplitSession::handleError(GWBUF* errmsgbuf,
 
                 if (!can_continue)
                 {
-                    if (!backend->is_master() && !backend->server()->master_err_is_logged)
-                    {
-                        MXS_ERROR("Server %s (%s) lost the master status while waiting"
-                                  " for a result. Client sessions will be closed.",
-                                  backend->name(),
-                                  backend->uri());
-                        backend->server()->master_err_is_logged = true;
-                    }
-                    else
-                    {
-                        int64_t idle = mxs_clock() - backend->dcb()->last_read;
-                        MXS_ERROR("Lost connection to the master server, closing session.%s "
-                                  "Connection has been idle for %.1f seconds. Error caused by: %s",
-                                  errmsg.c_str(), (float)idle / 10.f, extract_error(errmsgbuf).c_str());
-                    }
+                    int64_t idle = mxs_clock() - backend->dcb()->last_read;
+                    MXS_ERROR("Lost connection to the master server '%s', closing session.%s "
+                              "Connection has been idle for %.1f seconds. Error caused by: %s",
+                              backend->name(), errmsg.c_str(), (float)idle / 10.f,
+                              extract_error(errmsgbuf).c_str());
                 }
 
                 // Decrement the expected response count only if we know we can continue the sesssion.