diff --git a/src/utils/CertificateProvider.js b/src/utils/CertificateProvider.js
index 7609aae55..79466e9fb 100644
--- a/src/utils/CertificateProvider.js
+++ b/src/utils/CertificateProvider.js
@@ -362,9 +362,12 @@ export default class CertificateProvider {
       .then(dir => {
         return promisify(fs.readdir)(dir)
           .then(items => {
-            if (items.length !== 1) {
+            if (items.length > 1) {
               throw new Error('Conflict in temp dir');
             }
+            if (items.length === 0) {
+              throw new Error('Failed to pull CSR from device');
+            }
             return items[0];
           })
           .then(fileName => {