diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 86bc3a1b..291abd04 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -1533,6 +1533,10 @@ const char *modestrings[] =
 
 void setnext(int *mode, char *arg2)
 {
+    if(!multiplayer()) { //RR 10/12/12 - Is this the action we want?
+        conoutf("You cannot use setnext in singleplayer.");
+        return;
+    }
     if(*mode < 0 || *mode >= GMODE_NUM) return;
 
     switch(*mode)
diff --git a/source/src/editing.cpp b/source/src/editing.cpp
index 83bc479d..d2650dea 100644
--- a/source/src/editing.cpp
+++ b/source/src/editing.cpp
@@ -125,10 +125,10 @@ void checkselections()
 // update current selection, or add a new one
 void makesel(bool isnew)
 {
-    if(isnew) addselection(min(lastx, cx), min(lasty, cy), abs(lastx-cx)+1, abs(lasty-cy)+1, max(lasth, ch));
+    block &cursel = sels.last(); //RR 10/12/12 - FIXEME, error checking should happen with "isnew", not here checking if it really is new.
+    if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), abs(lastx-cx)+1, abs(lasty-cy)+1, max(lasth, ch));
     else
     {
-        block &cursel = sels.last();
         cursel.x = min(lastx, cx); cursel.y = min(lasty, cy);
         cursel.xs = abs(lastx-cx)+1; cursel.ys = abs(lasty-cy)+1;
         cursel.h = max(lasth, ch);