1 files changed, 2 insertions, 0 deletions
diff --git a/src/openbox.i b/src/openbox.i
index 3dbe190c..a3192756 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -37,6 +37,8 @@
 %}
 %extend ob::OBScreen {
   OBClient *client(int i) {
+    if (i >= (int)self->clients.size())
+      return NULL;
     ob::OBScreen::ClientList::iterator it = self->clients.begin();
     std::advance(it,i);
     return *it;