diff --git a/src/Track.h b/src/Track.h
index 1c326ce3b..3fb4e37e9 100644
--- a/src/Track.h
+++ b/src/Track.h
@@ -628,9 +628,11 @@ class TrackList final : public wxEvtHandler, public ListOfTracks
    std::shared_ptr<Subclass> Lock(const std::weak_ptr<Subclass> &wTrack)
    {
       auto pTrack = wTrack.lock();
-      auto pList = pTrack->mList.lock();
-      if (pTrack && this == pList.get())
-         return pTrack;
+      if (pTrack) {
+         auto pList = pTrack->mList.lock();
+         if (pTrack && this == pList.get())
+            return pTrack;
+      }
       return {};
    }