diff --git a/package.json b/package.json
index 95cda05..40bb59d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/proxy",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A CLI tool to run an Express server that proxies CRUD requests to a ZenStack backend",
   "main": "index.js",
   "publishConfig": {
diff --git a/src/zmodel-parser.ts b/src/zmodel-parser.ts
index 67813f4..bc190c6 100644
--- a/src/zmodel-parser.ts
+++ b/src/zmodel-parser.ts
@@ -75,7 +75,7 @@ function loadPrismaConfig(schemaDir: string): string | null {
     const config = configFn(env)
     return config?.datasource?.url
   } catch (error) {
-    if (error instanceof Error && error.message.includes('Environment variable')) {
+    if (error instanceof Error) {
       throw error
     }
     console.warn(`Warning: Failed to parse prisma.config.ts: ${error}`)
@@ -132,6 +132,9 @@ function parseDatasource(
       const urlFn = new Function('env', `return ${urlValueStr}`)
       url = urlFn(env)
     } catch (evalError) {
+      if (evalError instanceof CliError) {
+        throw evalError
+      }
       throw new CliError(
         'Could not evaluate datasource url from schema, you could provide it via -d option.'
       )
@@ -141,7 +144,7 @@ function parseDatasource(
     // If still no URL found, throw error
     if (url == null) {
       throw new CliError(
-        'No datasource URL found. For Prisma 7, ensure prisma.config.ts exists with datasource configuration, or provide the URL via -d option.'
+        'No datasource URL found. For Prisma 7, ensure prisma.config.ts exists with datasource configuration or directly provide the URL via -d option.'
       )
     }
   }