diff --git a/graf2d/gpad/src/TCreatePrimitives.cxx b/graf2d/gpad/src/TCreatePrimitives.cxx
index 470b30c7704bfd6a5145ac1edefb6fbfa656b9dc..6b2aced0f15f742f4cbb0c01f69b5fad401586de 100644
--- a/graf2d/gpad/src/TCreatePrimitives.cxx
+++ b/graf2d/gpad/src/TCreatePrimitives.cxx
@@ -111,7 +111,7 @@ void TCreatePrimitives::Ellipse(Int_t event, Int_t px, Int_t py, Int_t mode)
       }
       gPad->GetCanvas()->FeedbackMode(kFALSE);
       gPad->Modified(kTRUE);
-      el->Draw();
+      if (el) el->Draw();
       gPad->GetCanvas()->Selected((TPad*)gPad, el, event);
       gROOT->SetEditorMode();
       break;
@@ -374,7 +374,7 @@ void TCreatePrimitives::Pave(Int_t event, Int_t px, Int_t py, Int_t mode)
       }
       gPad->GetCanvas()->FeedbackMode(kFALSE);
       gPad->Modified(kTRUE);
-      pave->Draw();
+      if (pave) pave->Draw();
       gPad->GetCanvas()->Selected((TPad*)gPad, pave, event);
       gROOT->SetEditorMode();
       gPad->Update();