diff --git a/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx b/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx
index 2d551bd0925..5efc751fca3 100644
--- a/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx
+++ b/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx
@@ -84,10 +84,12 @@ export const SchemaGraph = () => {
     if (schema === undefined) return console.error('Schema is required')
 
     const nodes = reactFlowInstance.getNodes()
-    const nodesPositionData = nodes.reduce((a, b) => {
-      return { ...a, [b.id]: b.position }
-    }, {})
-    setStoredPositions(nodesPositionData)
+    if (nodes.length > 0) {
+      const nodesPositionData = nodes.reduce((a, b) => {
+        return { ...a, [b.id]: b.position }
+      }, {})
+      setStoredPositions(nodesPositionData)
+    }
   }
 
   useEffect(() => {
diff --git a/apps/studio/components/interfaces/Functions/FunctionsNav.tsx b/apps/studio/components/interfaces/Functions/FunctionsNav.tsx
index d25017cef89..a5abae6f49a 100644
--- a/apps/studio/components/interfaces/Functions/FunctionsNav.tsx
+++ b/apps/studio/components/interfaces/Functions/FunctionsNav.tsx
@@ -12,9 +12,11 @@ const FunctionsNav = ({ item }: any) => {
       type="underlined"
       size="medium"
       activeId={!activeRoute ? 'metrics' : activeRoute}
-      onChange={(e: string) =>
-        router.push(`/project/${ref}/functions/${item.slug}/${e === 'metrics' ? '' : e}`)
-      }
+      onChange={(e: string) => {
+        if (item.slug) {
+          router.push(`/project/${ref}/functions/${item.slug}/${e === 'metrics' ? '' : e}`)
+        }
+      }}
     >
       <Tabs.Panel id="details" label="Details" />
       <Tabs.Panel id="metrics" label="Metrics" />
diff --git a/apps/studio/data/projects/project-create-mutation.ts b/apps/studio/data/projects/project-create-mutation.ts
index d6e2bbe2eff..5e9a11d8d3d 100644
--- a/apps/studio/data/projects/project-create-mutation.ts
+++ b/apps/studio/data/projects/project-create-mutation.ts
@@ -12,6 +12,9 @@ const WHITELIST_ERRORS = [
   'The following organization members have reached their maximum limits for the number of active free projects',
   'db_pass must be longer than or equal to 4 characters',
   'There are overdue invoices in the organization(s)',
+  'name should not contain a . string',
+  'Project creation in the Supabase dashboard is disabled for this Vercel-managed organization.',
+  'Your account, which is handled by the Fly Supabase extension, cannot access this endpoint.',
 ]
 
 export type DbInstanceSize = components['schemas']['DesiredInstanceSize']