Index: source/lobby/glooxwrapper/glooxwrapper.cpp
===================================================================
--- source/lobby/glooxwrapper/glooxwrapper.cpp
+++ source/lobby/glooxwrapper/glooxwrapper.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -219,15 +219,13 @@
 	virtual void handleDataForm(const gloox::JID& from, const gloox::DataForm& UNUSED(form))
 	{
 		glooxwrapper::JID fromWrapped(from);
-		/* DataForm not supported */
-		m_Wrapped->handleDataForm(fromWrapped, *(glooxwrapper::DataForm*)NULL);
+		ENSURE(false && "glooxwrapper: DataForm not supported");
 	}
 
 	virtual void handleOOB(const gloox::JID& from, const gloox::OOB& UNUSED(oob))
 	{
 		glooxwrapper::JID fromWrapped(from);
-		/* OOB not supported */
-		m_Wrapped->handleOOB(fromWrapped, *(glooxwrapper::OOB*)NULL);
+		ENSURE(false && "glooxwrapper: OOB not supported");
 	}
 };