diff --git a/doomsday/libappfw/src/vr/oculusrift.cpp b/doomsday/libappfw/src/vr/oculusrift.cpp
index 9c0217bd4c..8b8bf7f784 100644
--- a/doomsday/libappfw/src/vr/oculusrift.cpp
+++ b/doomsday/libappfw/src/vr/oculusrift.cpp
@@ -271,6 +271,8 @@ void OculusRift::setPredictionLatency(float latency)
     {
         d->oculusTracker->setLatency(latency);
     }
+#else
+    DENG2_UNUSED(latency);
 #endif
 }
 
diff --git a/doomsday/libappfw/src/widgets/tabwidget.cpp b/doomsday/libappfw/src/widgets/tabwidget.cpp
index d41a8e44fc..809d6c77ad 100644
--- a/doomsday/libappfw/src/widgets/tabwidget.cpp
+++ b/doomsday/libappfw/src/widgets/tabwidget.cpp
@@ -83,10 +83,9 @@ DENG2_PIMPL(TabWidget)
 
     void setCurrent(ui::Data::Pos pos)
     {
-        if(current != pos)
+        if(current != pos && pos < buttons->items().size())
         {
             current = pos;
-            DENG2_ASSERT(current < buttons->items().size());
             updateSelected();
             emit self.currentTabChanged();
         }