diff --git a/owlps-positioning/src/inputcsv.cc b/owlps-positioning/src/inputcsv.cc
index 99a56f0..47764fe 100644
--- a/owlps-positioning/src/inputcsv.cc
+++ b/owlps-positioning/src/inputcsv.cc
@@ -125,7 +125,11 @@ const Request& InputCSV::get_next_request()
       measurements[mac_ap].set_ap(&ap) ;
       measurements[mac_ap].add_ss(ss) ;
     }
-
+  if (measurements.empty())
+    {
+      current_request->clear() ;
+      return *current_request ;
+    }
   current_request->set_measurements(measurements) ;
 
   // Calibration request?
diff --git a/owlps-positioning/src/inputudpsocket.cc b/owlps-positioning/src/inputudpsocket.cc
index f8440de..b63f1e5 100644
--- a/owlps-positioning/src/inputudpsocket.cc
+++ b/owlps-positioning/src/inputudpsocket.cc
@@ -150,7 +150,11 @@ const Request& InputUDPSocket::get_next_request()
       measurements[mac_ap].add_ss(static_cast<int_fast8_t>
                                   (request_info.antenna_signal_dbm)) ;
     }
-
+  if (measurements.empty())
+    {
+      current_request->clear() ;
+      return *current_request ;
+    }
   current_request->set_measurements(measurements) ;
 
   // Calibration request?