1 files changed, 8 insertions, 10 deletions

diff --git a/server.ts b/server.ts
index f04e993f6..385996470 100644
--- a/server.ts
+++ b/server.ts
@@ -1,11 +1,3 @@
-import { registerTSPaths } from './server/helpers/register-ts-paths'
-registerTSPaths()
-
-import { isTestInstance } from './server/helpers/core-utils'
-if (isTestInstance()) {
-  require('source-map-support').install()
-}
-
 // ----------- Node modules -----------
 import express from 'express'
 import morgan, { token } from 'morgan'
@@ -19,7 +11,7 @@ import { program as cli } from 'commander'
 process.title = 'peertube'
 
 // Create our main app
-const app = express().disable("x-powered-by")
+const app = express().disable('x-powered-by')
 
 // ----------- Core checker -----------
 import { checkMissedConfig, checkFFmpeg, checkNodeVersion } from './server/initializers/checker-before-init'
@@ -41,7 +33,12 @@ checkFFmpeg(CONFIG)
     process.exit(-1)
   })
 
-checkNodeVersion()
+try {
+  checkNodeVersion()
+} catch (err) {
+  logger.error('Error in NodeJS check.', { err })
+  process.exit(-1)
+}
 
 import { checkConfig, checkActivityPubUrls, checkFFmpegVersion } from './server/initializers/checker-after-init'
 
@@ -130,6 +127,7 @@ import { HttpStatusCode } from './shared/models/http/http-error-codes'
 import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache'
 import { ServerConfigManager } from '@server/lib/server-config-manager'
 import { VideoViews } from '@server/lib/video-views'
+import { isTestInstance } from './server/helpers/core-utils'
 
 // ----------- Command line -----------