diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js
index 389b8b401..b92ab18be 100644
--- a/src/skins/vector/views/molecules/EventTile.js
+++ b/src/skins/vector/views/molecules/EventTile.js
@@ -76,7 +76,7 @@ module.exports = React.createClass({
         // This shouldn't happen: the caller should check we support this type
         // before trying to instantiate us
         if (!EventTileType) {
-            return null;
+            throw new Error("Event type not supported");
         }
 
         var classes = classNames({