diff --git a/.travis.yml b/.travis.yml
index 4db8a3ec57..b195f64b60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,7 @@ script:
   - mkdir build
   - cd build
   - cmake ${CMAKE_OPTIONS} -DPK3_QUIET_ZIPDIR=YES ..
-  - make -j2
+  - make -j2 -k
 
 notifications:
   email: false
diff --git a/src/w_wad.cpp b/src/w_wad.cpp
index fc6121b738..18bf2aa390 100644
--- a/src/w_wad.cpp
+++ b/src/w_wad.cpp
@@ -1363,7 +1363,10 @@ FileReader *FWadCollection::GetFileReader(int wadnum)
 	{
 		return NULL;
 	}
-	return Files[wadnum]->GetReader();
+
+	// Return reader for real files only and nullptr otherwise
+	FileReader* const reader = Files[wadnum]->GetReader();
+	return reader->isOpen() ? reader : nullptr;
 }
 
 //==========================================================================