diff --git a/packages/dev/inspector/src/components/actionTabs/tabs/propertyGrids/parentPropertyGridComponent.tsx b/packages/dev/inspector/src/components/actionTabs/tabs/propertyGrids/parentPropertyGridComponent.tsx
index 712f35d69a3..64cdee4f49e 100644
--- a/packages/dev/inspector/src/components/actionTabs/tabs/propertyGrids/parentPropertyGridComponent.tsx
+++ b/packages/dev/inspector/src/components/actionTabs/tabs/propertyGrids/parentPropertyGridComponent.tsx
@@ -22,6 +22,11 @@ export class ParentPropertyGridComponent extends React.Component<IParentProperty
         super(props);
     }
 
+    private _getNameForSorting(node: any) {
+        const isNameAString = node.name && typeof node.name === "string";
+        return isNameAString ? node.name : "no name";
+    }
+
     render() {
         const node = this.props.node;
         const scene = node.getScene();
@@ -29,7 +34,10 @@ export class ParentPropertyGridComponent extends React.Component<IParentProperty
         const sortedNodes = scene
             .getNodes()
             .filter((n) => n !== node)
-            .sort((a, b) => (a.name || "no name").localeCompare(b.name || "no name"));
+            .map((n) => this._getNameForSorting(n))
+            .sort((aName, bName) => {
+                return aName.localeCompare(bName);
+            });
 
         const nodeOptions = sortedNodes.map((m, i) => {
             return {
@@ -57,7 +65,7 @@ export class ParentPropertyGridComponent extends React.Component<IParentProperty
                     noDirectUpdate={true}
                     onSelect={(value) => {
                         const nodeAsTransform = node as TransformNode;
-                        if (value < 0) {
+                        if (typeof value !== "number" || value < 0) {
                             if (nodeAsTransform.setParent) {
                                 nodeAsTransform.setParent(null);
                             } else {
diff --git a/packages/dev/inspector/src/components/sceneExplorer/entities/meshTreeItemComponent.tsx b/packages/dev/inspector/src/components/sceneExplorer/entities/meshTreeItemComponent.tsx
index 1174e6921f0..c2fdc5f39d9 100644
--- a/packages/dev/inspector/src/components/sceneExplorer/entities/meshTreeItemComponent.tsx
+++ b/packages/dev/inspector/src/components/sceneExplorer/entities/meshTreeItemComponent.tsx
@@ -39,6 +39,12 @@ export class MeshTreeItemComponent extends React.Component<IMeshTreeItemComponen
         this.props.mesh.isVisible = newState;
     }
 
+    // mesh.name can fail the type check when we're in javascript, so
+    // we can check to avoid crashing
+    private _getNameForLabel(): string {
+        return typeof this.props.mesh.name === "string" ? this.props.mesh.name : "no name";
+    }
+
     render() {
         const mesh = this.props.mesh;
 
@@ -46,7 +52,7 @@ export class MeshTreeItemComponent extends React.Component<IMeshTreeItemComponen
 
         return (
             <div className="meshTools">
-                <TreeItemLabelComponent label={mesh.name} onClick={() => this.props.onClick()} icon={faCube} color="dodgerblue" />
+                <TreeItemLabelComponent label={this._getNameForLabel()} onClick={() => this.props.onClick()} icon={faCube} color="dodgerblue" />
                 <div
                     className={this.state.isBoundingBoxEnabled ? "bounding-box selected icon" : "bounding-box icon"}
                     onClick={() => this.showBoundingBox()}