diff --git a/src/Core/RideItem.cpp b/src/Core/RideItem.cpp
index 32eb66dc0..d72834e45 100644
--- a/src/Core/RideItem.cpp
+++ b/src/Core/RideItem.cpp
@@ -240,7 +240,7 @@ RideFile *RideItem::ride(bool open)
 RideItem::~RideItem()
 {
     // add to the deleted list
-    if (context->athlete->rideCache) context->athlete->rideCache->deletelist << this;
+    if (context && context->athlete && context->athlete->rideCache) context->athlete->rideCache->deletelist << this;
 
     //qDebug()<<"deleting:"<<fileName;
     if (isOpen()) close();