diff --git a/package.json b/package.json
index d7b2bb91cdf0c87ca6f9ddf27e3c937c9417a458..2291040fa65e6be01c2539ca7cf4a3ab4a72910b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-discord",
-  "version": "1.0.0-rc3",
+  "version": "1.0.0",
   "description": "A bridge between Matrix and Discord",
   "main": "discordas.js",
   "scripts": {
diff --git a/src/discordas.ts b/src/discordas.ts
index e4b661748a745c5b8b4262c1ba89cbadd3db5dc0..e69562800f68d69dd1b5795f7d08a86100e44b90 100644
--- a/src/discordas.ts
+++ b/src/discordas.ts
@@ -129,10 +129,6 @@ async function run() {
     }
 
     const config = new DiscordBridgeConfig();
-    const port = opts.port || config.bridge.port;
-    if (!port) {
-        throw Error("Port not given in command line or config file");
-    }
     const readConfig = yaml.safeLoad(fs.readFileSync(configPath, "utf8"));
     if (typeof readConfig !== "object") {
         throw Error("Config is not of type object");
@@ -140,6 +136,10 @@ async function run() {
     config.applyConfig(readConfig);
     config.applyEnvironmentOverrides(process.env);
     Log.Configure(config.logging);
+    const port = opts.port || config.bridge.port;
+    if (!port) {
+        throw Error("Port not given in command line or config file");
+    }
     if (config.database.roomStorePath || config.database.userStorePath) {
         log.error("The keys 'roomStorePath' and/or 'userStorePath' is still defined in the config. " +
                   "Please see docs/bridge-migrations.md on " +