1 files changed, 7 insertions, 4 deletions
diff --git a/read_helper.h b/read_helper.h
index f12f4d9..eb7d2e3 100644
--- a/read_helper.h
+++ b/read_helper.h
@@ -2,12 +2,11 @@
 #ifndef LOCKFREE_READ_HELPER_H
 #define LOCKFREE_READ_HELPER_H
 
-#include <cassert>
 #include <cstdio>
 #include <random>
 #include <vector>
-#ifndef P_EFF
-#ifndef NDEBUG
+#ifndef P_ERR
+#if !(defined(NDEBUG) || defined(READ_NO_OUTPUT))
 #define P_ERR(...) fprintf(stderr, __VA_ARGS__)
 #else
 #define P_ERR(...)
@@ -62,7 +61,11 @@ public:
     this->population_vector.clear();
     auto read_number = 0UL;
     FILE *file = fopen(filename, "r");
-    assert(file);
+    if (file == nullptr) {
+      fprintf(stderr, "Unable to open file %s\n", filename);
+      exit(1);
+    }
+
     P_ERR("Reading sample");
     for (key_type i;
          read_number < sample_length && fscanf(file, "%lld ", &i) != EOF;