diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index 37739a43d..96b00b1a5 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -266,7 +266,7 @@ static bool LoadScriptFile(int lumpnum, FileReader *lump, int numnodes, bool inc
 	char buffer[4];
 
 	lump->Read(buffer, 4);
-	lump->Seek(0, SEEK_SET);
+	lump->Seek(-4, SEEK_CUR);
 
 	// The binary format is so primitive that this check is enough to detect it.
 	bool isbinary = (buffer[0] == 0 || buffer[1] == 0 || buffer[2] == 0 || buffer[3] == 0);
diff --git a/src/p_usdf.cpp b/src/p_usdf.cpp
index 21bd8eeb3..7bcca2204 100644
--- a/src/p_usdf.cpp
+++ b/src/p_usdf.cpp
@@ -71,6 +71,7 @@ class USDFParser : public UDMFParserBase
 				sc.ScriptMessage("'%s' is not an actor type", key);
 				return NULL;
 			}
+			return cls;
 		}
 		return NULL;
 	}