diff --git a/packages/api/src/database/config.ts b/packages/api/src/database/config.ts
index b41f06f7..7c9a4c63 100644
--- a/packages/api/src/database/config.ts
+++ b/packages/api/src/database/config.ts
@@ -1,16 +1,23 @@
 import * as Knex from "knex";
+import { join } from "path";
 import { Model } from "objection";
 
 export default () => {
-  const knexConnection = Knex(
-    require(process.env.KNEXFILE || "../../knexfile")
-  );
+  const config = process.env.KNEXFILE
+    ? // tslint:disable-next-line: no-var-requires
+      require(process.env.KNEXFILE)
+    : // tslint:disable-next-line: no-var-requires
+      require(join(__dirname, "..", "..", "knexfile"));
+  const knexConnection = Knex(config);
   Model.knex(knexConnection);
 };
 
 const aggregatorDatabase = Knex(
-  // tslint:disable-next-line: no-var-requires
-  require(process.env.KNEXFILE_AGGREGATOR || "../../knexfile-aggregator")
+  process.env.KNEXFILE_AGGREGATOR
+    ? // tslint:disable-next-line: no-var-requires
+      require(process.env.KNEXFILE_AGGREGATOR)
+    : // tslint:disable-next-line: no-var-requires
+      require(join(__dirname, "..", "..", "knexfile"))
 );
 
 export { aggregatorDatabase };
diff --git a/packages/api/src/model/dossier-record.model.ts b/packages/api/src/model/dossier-record.model.ts
index 2897ac52..c05b0628 100644
--- a/packages/api/src/model/dossier-record.model.ts
+++ b/packages/api/src/model/dossier-record.model.ts
@@ -102,8 +102,15 @@ export const hasExpired = (dossier: DossierRecord): boolean => {
 
 export const getDateDebutAPTValue = (doc: DossierRecord) =>
   getPrivateFieldValue(doc, "Date de début APT");
-export const getDateFinAPTValue = (doc: DossierRecord) =>
-  getPrivateFieldValue(doc, "Date de fin APT");
+export const getDateFinAPTValue = (doc: DossierRecord) => {
+  try {
+    return getPrivateFieldValue(doc, "Date de fin APT");
+  } catch (error) {
+    // Throwing here means that it's not present...
+    return "";
+  }
+};
+
 export const getPrenomValue = (doc: DossierRecord) => {
   try {
     return getPublicFieldValue(doc, "Prénom");
diff --git a/yarn.lock b/yarn.lock
index 6bfcdf74..995995dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1890,6 +1890,11 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@vercel/ncc@^0.25.1":
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.25.1.tgz#a4aacdb508ac496fc0c63a3c3203d700a619cc0e"
+  integrity sha512-dGecC5+1wLof1MQpey4+6i2KZv4Sfs6WfXkl9KfO32GED4ZPiKxRfvtGPjbjZv0IbqMl6CxtcV1RotXYfd5SSA==
+
 "@zkochan/cmd-shim@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e"