2 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 82580fc83f02..eb1941aa9c19 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -105,7 +105,7 @@ namespace dbaui
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Reference< XAccessible > aRet;
-        if(m_pTable)
+        if(m_pTable && !m_pTable->IsDisposed())
         {
             switch(i)
             {
@@ -151,7 +151,7 @@ namespace dbaui
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         Reference< XAccessible > aRet;
-        if( m_pTable )
+        if(m_pTable && !m_pTable->IsDisposed())
         {
             Point aPoint(_aPoint.X,_aPoint.Y);
             Rectangle aRect(m_pTable->GetDesktopRectPixel());
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 72e75deb07b9..5e7f370b8600 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -69,7 +69,7 @@ bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
     bool nDone = false;
     if(rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
     {
-        if(!m_pTableView->HasChildPathFocus())
+        if(m_pTableView && !m_pTableView->HasChildPathFocus())
         {
             m_pTableView->GrabTabWinFocus();
             nDone = true;