2 files changed, 12 insertions, 11 deletions

diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index 9143232..0289ddd 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -114,13 +114,14 @@ FbPixmap &FbPixmap::operator = (Pixmap pm) {
     Window root;
     int x, y;
     unsigned int border_width, bpp;
-    XGetGeometry(display(),
-                 pm,
-                 &root,
-                 &x, &y,
-                 &m_width, &m_height,
-                 &border_width,
-                 &bpp);
+    if (!XGetGeometry(display(),
+                      pm,
+                      &root,
+                      &x, &y,
+                      &m_width, &m_height,
+                      &border_width,
+                      &bpp))
+        return *this;
 
     m_depth = bpp;
 
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 3dce5b8..2c2bb24 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -582,10 +582,10 @@ void FbWindow::updateGeometry() {
 
     Window root;
     unsigned int border_width, depth;
-    XGetGeometry(display(), m_window, &root, &m_x, &m_y,
-                 (unsigned int *)&m_width, (unsigned int *)&m_height,
-                 &border_width, &depth);
-    m_depth = depth;
+    if (XGetGeometry(display(), m_window, &root, &m_x, &m_y,
+                     (unsigned int *)&m_width, (unsigned int *)&m_height,
+                     &border_width, &depth))
+        m_depth = depth;
 }
 
 void FbWindow::create(Window parent, int x, int y,