diff --git a/Editor/Toolbar/Tools/ToolUICanvasPicker.cs b/Editor/Toolbar/Tools/ToolUICanvasPicker.cs
index df7888f..e061d07 100644
--- a/Editor/Toolbar/Tools/ToolUICanvasPicker.cs
+++ b/Editor/Toolbar/Tools/ToolUICanvasPicker.cs
@@ -68,10 +68,16 @@ namespace Game.NavigationTool.Editor.Tools
 
         private static void Focus(int instanceId)
         {
-            var canvas = EditorUtility.InstanceIDToObject(instanceId) as Canvas;
-
+            var obj = EditorUtility.InstanceIDToObject(instanceId);
+            var canvas = obj as Canvas;
+            
             if (canvas == null)
+            {
+                if (obj != null)
+                    Debug.LogWarning("Failed to find Canvas component on object", obj);
+                
                 return;
+            }
 
             Selection.activeObject = canvas;
             Bounds bounds = InternalEditorUtility.CalculateSelectionBounds(false, true, true);
diff --git a/package.json b/package.json
index cdcf8f3..6d199ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.module.navigationtool",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "displayName": "Module.NavigationTool",
   "description": "Support for navigation tools, like favorites, history and toolbars",
   "unity": "2019.2",