diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js
index df7b5e989..61e789b0a 100644
--- a/js/modules/loki_snode_api.js
+++ b/js/modules/loki_snode_api.js
@@ -1,5 +1,5 @@
 /* eslint-disable class-methods-use-this */
-/* global window, ConversationController */
+/* global window, ConversationController, _ */
 
 const is = require('@sindresorhus/is');
 const dns = require('dns');
@@ -70,6 +70,9 @@ class LokiSnodeAPI {
     if (this.randomSnodePool.length === 0) {
       await this.initialiseRandomPool();
     }
+    if (this.randomSnodePool.length === 0) {
+      throw new window.textsecure.SeedNodeError('Invalid seed node response');
+    }
     return this.randomSnodePool[
       Math.floor(Math.random() * this.randomSnodePool.length)
     ];
@@ -83,19 +86,26 @@ class LokiSnodeAPI {
         storage_port: true,
       },
     };
-    const result = await rpc(
-      `http://${window.seedNodeUrl}`,
-      window.seedNodePort,
-      'get_n_service_nodes',
-      params,
-      {}, // Options
-      '/json_rpc' // Seed request endpoint
-    );
-    const snodes = result.result.service_node_states;
-    this.randomSnodePool = snodes.map(snode => ({
-      address: snode.public_ip,
-      port: snode.storage_port,
-    }));
+    try {
+      const result = await rpc(
+        `http://${window.seedNodeUrl}`,
+        window.seedNodePort,
+        'get_n_service_nodes',
+        params,
+        {}, // Options
+        '/json_rpc' // Seed request endpoint
+      );
+      // Filter 0.0.0.0 nodes which haven't submitted uptime proofs
+      const snodes = result.result.service_node_states.filter(
+        snode => snode.address !== '0.0.0.0'
+      );
+      this.randomSnodePool = snodes.map(snode => ({
+        address: snode.public_ip,
+        port: snode.storage_port,
+      }));
+    } catch (e) {
+      throw new window.textsecure.SeedNodeError('Failed to contact seed node');
+    }
   }
 
   async unreachableNode(pubKey, nodeUrl) {
@@ -197,16 +207,23 @@ class LokiSnodeAPI {
   async getSwarmNodes(pubKey) {
     // TODO: Hit multiple random nodes and merge lists?
     const { address, port } = await this.getRandomSnodeAddress();
-
-    const result = await rpc(
-      `https://${address}`,
-      port,
-      'get_snodes_for_pubkey',
-      {
-        pubKey,
-      }
-    );
-    return result.snodes;
+    try {
+      const result = await rpc(
+        `https://${address}`,
+        port,
+        'get_snodes_for_pubkey',
+        {
+          pubKey,
+        }
+      );
+      return result.snodes;
+    } catch (e) {
+      this.randomSnodePool = _.without(
+        this.randomSnodePool,
+        _.find(this.randomSnodePool, { address })
+      );
+      return this.getSwarmNodes(pubKey);
+    }
   }
 }
 
diff --git a/libtextsecure/errors.js b/libtextsecure/errors.js
index 0ad331080..d690a8fb0 100644
--- a/libtextsecure/errors.js
+++ b/libtextsecure/errors.js
@@ -195,6 +195,18 @@
     appendStack(this, error);
   }
 
+  function SeedNodeError(message) {
+    this.name = 'SeedNodeError';
+    this.message = message;
+    Error.call(this, message);
+
+    // Maintains proper stack trace, where our error was thrown (only available on V8)
+    //   via https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this);
+    }
+  }
+
   function HTTPError(message, response) {
     this.name = 'HTTPError';
     this.message = `${response.status} Error: ${message}`;
@@ -245,6 +257,7 @@
   window.textsecure.SignedPreKeyRotationError = SignedPreKeyRotationError;
   window.textsecure.PoWError = PoWError;
   window.textsecure.EmptySwarmError = EmptySwarmError;
+  window.textsecure.SeedNodeError = SeedNodeError;
   window.textsecure.DNSResolutionError = DNSResolutionError;
   window.textsecure.LokiIpError = LokiIpError;
   window.textsecure.HTTPError = HTTPError;