diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index a4160561542bb47a1e0a9b15821f5bd67f54b26b..5f286232c11904cba2c743242a8c6bbe257a535c 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -1107,9 +1107,16 @@ void Configuration::readAtoms() {
 		// Legitimate ATOM input lines have 6 tokens: 
 		// ATOM | Index | Name | X-coord | Y-coord | Z-coord
 		// A line without exactly six tokens should be discarded.
-		if (numTokens != 6) {
-			printf("Warning: Invalid particle file line: %s\n", line);
-			return;
+                if (ParticleDynamicType == String("Langevin") || ParticleDynamicType == String("NoseHooverLangevin")) {
+		    if (numTokens != 9) {
+			printf("Error: Invalid particle file line: %s\n", line);
+			exit(-1);
+		    }
+		} else {
+		    if (numTokens != 6) {
+			printf("Error: Invalid particle file line: %s\n", line);
+			exit(-1);
+		    }
 		}
 
 		// Ensure that this particle's type was defined in the config file.