diff --git a/packages/core/src/utils/graph.ts b/packages/core/src/utils/graph.ts
index 147b5c05..0a49a678 100644
--- a/packages/core/src/utils/graph.ts
+++ b/packages/core/src/utils/graph.ts
@@ -69,7 +69,7 @@ export function getHostForElement(element: HTMLElement): Document {
 
 // todo: refactor generic to use MaybeElement
 export function isEdge<Data = ElementData>(element: MaybeElement): element is Edge<Data> {
-  return typeof element === 'object' && 'id' in element && 'source' in element && 'target' in element
+  return element && typeof element === 'object' && 'id' in element && 'source' in element && 'target' in element
 }
 
 // todo: refactor generic to use MaybeElement
@@ -79,7 +79,7 @@ export function isGraphEdge<Data = ElementData>(element: MaybeElement): element
 
 // todo: refactor generic to use MaybeElement
 export function isNode<Data = ElementData>(element: MaybeElement): element is Node<Data> {
-  return typeof element === 'object' && 'id' in element && !isEdge(element)
+  return element && typeof element === 'object' && 'id' in element && 'position' in element && !isEdge(element)
 }
 
 // todo: refactor generic to use MaybeElement
diff --git a/packages/core/src/utils/store.ts b/packages/core/src/utils/store.ts
index 136b92e2..75ee4e4f 100644
--- a/packages/core/src/utils/store.ts
+++ b/packages/core/src/utils/store.ts
@@ -1,11 +1,11 @@
-import { toValue } from '@vueuse/core'
+import { unref } from 'vue'
 import { ErrorCode, VueFlowError, connectionExists, getEdgeId, isEdge, isNode, parseEdge, parseNode } from '.'
 import type { Actions, Connection, Edge, GraphEdge, GraphNode, Node, State } from '~/types'
 
 type NonUndefined<T> = T extends undefined ? never : T
 
 export function isDef<T>(val: T): val is NonUndefined<T> {
-  const unrefVal = toValue(val)
+  const unrefVal = unref(val)
 
   return typeof unrefVal !== 'undefined'
 }