diff --git a/epf/Epf.cpp b/epf/Epf.cpp
index aa5ed00..45ec9b0 100644
--- a/epf/Epf.cpp
+++ b/epf/Epf.cpp
@@ -252,8 +252,6 @@ void Epf::fillMetadata(const pdal::PointLayout& layout)
         m_b.offset[1] = calcOffset(m_b.trueBounds.miny, m_b.trueBounds.maxy, m_b.scale[1]);
         m_b.offset[2] = calcOffset(m_b.trueBounds.minz, m_b.trueBounds.maxz, m_b.scale[2]);
     }
-
-    exit(0);
 }
 
 void Epf::createFileInfos(const StringList& input, std::vector<FileInfo>& fileInfos)
diff --git a/epf/FileProcessor.cpp b/epf/FileProcessor.cpp
index e9c977c..102dd87 100644
--- a/epf/FileProcessor.cpp
+++ b/epf/FileProcessor.cpp
@@ -134,11 +134,12 @@ void FileProcessor::run()
     opts.add("filename", m_fi.filename);
     opts.add("count", m_fi.numPoints);
     if (m_fi.driver == "readers.las")
+    {
         opts.add("nosrs", m_fi.no_srs);
 #ifdef PDAL_LAS_START
-    if (m_fi.driver == "readers.las")
         opts.add("start", m_fi.start);
 #endif
+    }
 
     pdal::StageFactory factory;
     pdal::Stage *s = factory.createStage(m_fi.driver);