Merge pull request #753 from StephenHodgson/HTK-InputManager

InputManager Update

Author: keveleigh

Assets/HoloToolkit/Input/Scripts/InputManager.cs

@@ -241,9 +241,8 @@ public void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventFunction<
 
                 // If there is a focused object in the hierarchy of the modal handler, start the event
                 // bubble there
-                if (focusedObject != null && focusedObject.transform.IsChildOf(modalInput.transform))
+                if (focusedObject != null && modalInput != null && focusedObject.transform.IsChildOf(modalInput.transform))
                 {
-
                     if (ExecuteEvents.ExecuteHierarchy(focusedObject, eventData, eventHandler))
                     {
                         return;