diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index e2e42c20f9..f27efff29e 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -329,6 +329,19 @@ exports.sync = async ctx => {
     ctx.throw(400, "This action cannot be performed for production apps")
   }
   const prodAppId = getDeployedAppID(appId)
+
+  try {
+    const prodDb = new CouchDB(prodAppId, { skip_setup: true })
+    const info = await prodDb.info()
+    if (info.error) throw info.error
+  } catch (err) {
+    // the database doesn't exist. Don't replicate
+    ctx.body = {
+      message: "App sync not required, app not deployed.",
+    }
+    return
+  }
+
   const replication = new Replication({
     source: prodAppId,
     target: appId,
diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js
index c43de7f553..ed58b8048b 100644
--- a/packages/server/src/api/controllers/dev.js
+++ b/packages/server/src/api/controllers/dev.js
@@ -82,6 +82,13 @@ exports.revert = async ctx => {
     const db = new CouchDB(productionAppId, { skip_setup: true })
     const info = await db.info()
     if (info.error) throw info.error
+    const deploymentDoc = await db.get(DocumentTypes.DEPLOYMENTS)
+    if (
+      !deploymentDoc.history ||
+      Object.keys(deploymentDoc.history).length === 0
+    ) {
+      throw new Error("No deployments for app")
+    }
   } catch (err) {
     return ctx.throw(400, "App has not yet been deployed")
   }