diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index e33517efd..063e226a5 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -408,7 +408,7 @@ void EventBrowser::on_events_currentItemChanged(RDTreeWidgetItem *current, RDTre
     ui->stepNext->setEnabled(true);
 
   // special case for the first 'virtual' draw at EID 0
-  if(tag.lastEID == m_Ctx.GetFirstDrawcall()->eventID)
+  if(m_Ctx.GetFirstDrawcall() && tag.lastEID == m_Ctx.GetFirstDrawcall()->eventID)
     ui->stepPrev->setEnabled(true);
 
   highlightBookmarks();
diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp
index 0430e1135..16bf24464 100644
--- a/qrenderdoc/Windows/PixelHistoryView.cpp
+++ b/qrenderdoc/Windows/PixelHistoryView.cpp
@@ -138,7 +138,7 @@ public:
       const QList<PixelModification> &mods = getMods(parent);
       const DrawcallDescription *draw = m_Ctx.GetDrawcall(mods.front().eventID);
 
-      if(draw->flags & DrawFlags::Clear)
+      if(draw && draw->flags & DrawFlags::Clear)
         return 0;
 
       return mods.count();