diff --git a/src/WkoRideFile.cpp b/src/WkoRideFile.cpp
index 1258060e7..4908f1e83 100644
--- a/src/WkoRideFile.cpp
+++ b/src/WkoRideFile.cpp
@@ -207,6 +207,7 @@ WKO_UCHAR *WkoParseRawData(WKO_UCHAR *fb, RideFile *rideFile)
      * RUN THROUGH EACH RAW DATA RECORD
      *==============================================================================*/
     rdist=rtime=0;
+    if (!records) return NULL;
     while (records) {
 
         unsigned int marker;
diff --git a/src/test/rides/2008_06_25_20_59_49.wko b/src/test/rides/2008_06_25_20_59_49.wko
new file mode 100644
index 000000000..6bff2bcf0
Binary files /dev/null and b/src/test/rides/2008_06_25_20_59_49.wko differ