From 0211e00c86bc49a91c5d5944f8c87df4d8014752 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Mon, 2 Nov 2015 15:01:59 -0800
Subject: [PATCH] Cleaning the feature not conditional do the true design

---
 libraries/controllers/src/controllers/UserInputMapper.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
index a5d447d479..192404b85a 100755
--- a/libraries/controllers/src/controllers/UserInputMapper.cpp
+++ b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -839,6 +839,9 @@ Conditional::Pointer UserInputMapper::parseConditional(const QJsonValue& value)
 
         auto input = findDeviceInput(conditionalToken);
         auto endpoint = endpointFor(input);
+        if (!endpoint) {
+            return Conditional::Pointer();
+        }
         auto conditional = std::make_shared<EndpointConditional>(endpoint);
 
         if (!conditionalModifier.isEmpty()) {