diff --git a/src/am_map.cpp b/src/am_map.cpp
index ea5e9c3b..fd46c801 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -2291,19 +2291,15 @@ void AM_drawAuthorMarkers ()
 
 		while (marked != NULL)
 		{
-			if (mark->args[1] == 0 || (mark->args[1] == 1))
+			// Use more correct info if we have GL nodes available
+			if (mark->args[1] == 0 ||
+				(mark->args[1] == 1 && (hasglnodes ?
+				 marked->subsector->flags & SSECF_DRAWN :
+				 marked->Sector->MoreFlags & SECF_DRAWN)))
 			{
-				// Use more correct info if we have GL nodes available
-				INTBOOL drawn = hasglnodes?
-					marked->subsector->flags & SSECF_DRAWN :
-					marked->Sector->MoreFlags & SECF_DRAWN;
-
-				if (drawn)
-				{
-					DrawMarker (tex, marked->x >> FRACTOMAPBITS, marked->y >> FRACTOMAPBITS, 0,
-						flip, mark->scaleX, mark->scaleY, mark->Translation,
-						mark->alpha, mark->fillcolor, mark->RenderStyle);
-				}
+				DrawMarker (tex, marked->x >> FRACTOMAPBITS, marked->y >> FRACTOMAPBITS, 0,
+					flip, mark->scaleX, mark->scaleY, mark->Translation,
+					mark->alpha, mark->fillcolor, mark->RenderStyle);
 			}
 			marked = mark->args[0] != 0 ? it.Next() : NULL;
 		}
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index c193f76d..78a32f13 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1134,6 +1134,14 @@ static bool P_CheckV4Nodes(MapData *map)
 //
 //===========================================================================
 
+struct badseg
+{
+	badseg(int t, int s, int d) : badtype(t), badsegnum(s), baddata(d) {}
+	int badtype;
+	int badsegnum;
+	int baddata;
+};
+
 template<class segtype>
 void P_LoadSegs (MapData * map)
 {
@@ -1199,7 +1207,7 @@ void P_LoadSegs (MapData * map)
 
 			if (vnum1 >= numvertexes || vnum2 >= numvertexes)
 			{
-				throw i * 4;
+				throw badseg(0, i, MAX(vnum1, vnum2));
 			}
 
 			li->v1 = &vertexes[vnum1];
@@ -1266,14 +1274,14 @@ void P_LoadSegs (MapData * map)
 			linedef = LittleShort(ml->linedef);
 			if ((unsigned)linedef >= (unsigned)numlines)
 			{
-				throw i * 4 + 1;
+				throw badseg(1, i, linedef);
 			}
 			ldef = &lines[linedef];
 			li->linedef = ldef;
 			side = LittleShort(ml->side);
 			if ((unsigned)(ldef->sidedef[side] - sides) >= (unsigned)numsides)
 			{
-				throw i * 4 + 2;
+				throw badseg(2, i, int(ldef->sidedef[side] - sides));
 			}
 			li->sidedef = ldef->sidedef[side];
 			li->frontsector = ldef->sidedef[side]->sector;
@@ -1290,20 +1298,20 @@ void P_LoadSegs (MapData * map)
 			}
 		}
 	}
-	catch (int foo)
+	catch (badseg bad)
 	{
-		switch (foo & 3)
+		switch (bad.badtype)
 		{
 		case 0:
-			Printf ("Seg %d references a nonexistant vertex.\n", foo >> 2);
+			Printf ("Seg %d references a nonexistant vertex %d (max %d).\n", bad.badsegnum, bad.baddata, numvertexes);
 			break;
 
 		case 1:
-			Printf ("Seg %d references a nonexistant linedef.\n", foo >> 2);
+			Printf ("Seg %d references a nonexistant linedef %d (max %d).\n", bad.badsegnum, bad.baddata, numlines);
 			break;
 
 		case 2:
-			Printf ("The linedef for seg %d references a nonexistant sidedef.\n", foo >> 2);
+			Printf ("The linedef for seg %d references a nonexistant sidedef %d (max %d).\n", bad.badsegnum, bad.baddata, numsides);
 			break;
 		}
 		Printf ("The BSP will be rebuilt.\n");
diff --git a/src/svnrevision.h b/src/svnrevision.h
index 48ead027..a832dabc 100644
--- a/src/svnrevision.h
+++ b/src/svnrevision.h
@@ -3,5 +3,5 @@
 // This file was automatically generated by the
 // updaterevision tool. Do not edit by hand.
 
-#define ZD_SVN_REVISION_STRING "2627"
-#define ZD_SVN_REVISION_NUMBER 2627
+#define ZD_SVN_REVISION_STRING "2629"
+#define ZD_SVN_REVISION_NUMBER 2629