diff --git a/packages/entity-database-adapter-knex/README.md b/packages/entity-database-adapter-knex/README.md
index 095fff03..1f6a6abf 100644
--- a/packages/entity-database-adapter-knex/README.md
+++ b/packages/entity-database-adapter-knex/README.md
@@ -17,7 +17,7 @@ const knexInstance = knex({
     user: process.env['PGUSER'],
     password: process.env['PGPASSWORD'],
     host: process.env['PGHOST'],
-    port: parseInt(process.env['PGPORT']!, 10),
+    port: parseInt(nullthrows(process.env['PGPORT']), 10),
     database: process.env['PGDATABASE'],
   },
 });
diff --git a/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresEntityIntegration-test.ts b/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresEntityIntegration-test.ts
index e0db1366..93f28171 100644
--- a/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresEntityIntegration-test.ts
+++ b/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresEntityIntegration-test.ts
@@ -23,7 +23,7 @@ describe('postgres entity integration', () => {
         user: nullthrows(process.env['PGUSER']),
         password: nullthrows(process.env['PGPASSWORD']),
         host: 'localhost',
-        port: parseInt(process.env['PGPORT']!, 10),
+        port: parseInt(nullthrows(process.env['PGPORT']), 10),
         database: nullthrows(process.env['PGDATABASE']),
       },
     });
diff --git a/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresInvalidSetup-test.ts b/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresInvalidSetup-test.ts
index 0d45b576..7edcf546 100644
--- a/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresInvalidSetup-test.ts
+++ b/packages/entity-database-adapter-knex/src/__integration-tests__/PostgresInvalidSetup-test.ts
@@ -16,7 +16,7 @@ describe('postgres entity integration', () => {
         user: nullthrows(process.env['PGUSER']),
         password: nullthrows(process.env['PGPASSWORD']),
         host: 'localhost',
-        port: parseInt(process.env['PGPORT']!, 10),
+        port: parseInt(nullthrows(process.env['PGPORT']), 10),
         database: nullthrows(process.env['PGDATABASE']),
       },
     });
diff --git a/packages/entity-database-adapter-knex/src/__integration-tests__/errors-test.ts b/packages/entity-database-adapter-knex/src/__integration-tests__/errors-test.ts
index 310202ad..66205281 100644
--- a/packages/entity-database-adapter-knex/src/__integration-tests__/errors-test.ts
+++ b/packages/entity-database-adapter-knex/src/__integration-tests__/errors-test.ts
@@ -24,7 +24,7 @@ describe('postgres errors', () => {
         user: nullthrows(process.env['PGUSER']),
         password: nullthrows(process.env['PGPASSWORD']),
         host: 'localhost',
-        port: parseInt(process.env['PGPORT']!, 10),
+        port: parseInt(nullthrows(process.env['PGPORT']), 10),
         database: nullthrows(process.env['PGDATABASE']),
       },
     });
@@ -52,7 +52,7 @@ describe('postgres errors', () => {
         user: nullthrows(process.env['PGUSER']),
         password: nullthrows(process.env['PGPASSWORD']),
         host: 'localhost',
-        port: parseInt(process.env['PGPORT']!, 10),
+        port: parseInt(nullthrows(process.env['PGPORT']), 10),
         database: nullthrows(process.env['PGDATABASE']),
       },
       acquireConnectionTimeout: 1,
diff --git a/packages/entity-full-integration-tests/src/__integration-tests__/EntityCacheInconsistency-test.ts b/packages/entity-full-integration-tests/src/__integration-tests__/EntityCacheInconsistency-test.ts
index 39182c7c..c508cbe6 100644
--- a/packages/entity-full-integration-tests/src/__integration-tests__/EntityCacheInconsistency-test.ts
+++ b/packages/entity-full-integration-tests/src/__integration-tests__/EntityCacheInconsistency-test.ts
@@ -111,7 +111,7 @@ describe('Entity cache inconsistency', () => {
         user: nullthrows(process.env['PGUSER']),
         password: nullthrows(process.env['PGPASSWORD']),
         host: 'localhost',
-        port: parseInt(process.env['PGPORT']!, 10),
+        port: parseInt(nullthrows(process.env['PGPORT']), 10),
         database: nullthrows(process.env['PGDATABASE']),
       },
     });
diff --git a/packages/entity-full-integration-tests/src/__integration-tests__/EntityEdgesIntegration-test.ts b/packages/entity-full-integration-tests/src/__integration-tests__/EntityEdgesIntegration-test.ts
index 74249a74..5d83783b 100644
--- a/packages/entity-full-integration-tests/src/__integration-tests__/EntityEdgesIntegration-test.ts
+++ b/packages/entity-full-integration-tests/src/__integration-tests__/EntityEdgesIntegration-test.ts
@@ -44,7 +44,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         user: nullthrows(process.env['PGUSER']),
         password: nullthrows(process.env['PGPASSWORD']),
         host: 'localhost',
-        port: parseInt(process.env['PGPORT']!, 10),
+        port: parseInt(nullthrows(process.env['PGPORT']), 10),
         database: nullthrows(process.env['PGDATABASE']),
       },
     });
diff --git a/packages/entity-full-integration-tests/src/__integration-tests__/EntitySelfReferentialEdgesIntegration-test.ts b/packages/entity-full-integration-tests/src/__integration-tests__/EntitySelfReferentialEdgesIntegration-test.ts
index 4985d4c3..54f2502b 100644
--- a/packages/entity-full-integration-tests/src/__integration-tests__/EntitySelfReferentialEdgesIntegration-test.ts
+++ b/packages/entity-full-integration-tests/src/__integration-tests__/EntitySelfReferentialEdgesIntegration-test.ts
@@ -173,7 +173,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         user: nullthrows(process.env['PGUSER']),
         password: nullthrows(process.env['PGPASSWORD']),
         host: 'localhost',
-        port: parseInt(process.env['PGPORT']!, 10),
+        port: parseInt(nullthrows(process.env['PGPORT']), 10),
         database: nullthrows(process.env['PGDATABASE']),
       },
     });