diff --git a/packages/cli/src/commands/build/loadBuildScriptToCache.js b/packages/cli/src/commands/build/loadBuildScriptToCache.js
index 8798f9c77..97f048fec 100644
--- a/packages/cli/src/commands/build/loadBuildScriptToCache.js
+++ b/packages/cli/src/commands/build/loadBuildScriptToCache.js
@@ -19,10 +19,13 @@ import decompress from 'decompress';
 import decompressTargz from 'decompress-targz';
 
 async function loadBuildScriptToCache(version, cachePath) {
-  const packageInfo = await axios.get('https://registry.npmjs.org/@lowdefy/build');
+  const registryUrl = 'https://registry.npmjs.org/@lowdefy/build';
+  const packageInfo = await axios.get(registryUrl);
   if (!packageInfo || !packageInfo.data) {
-    // TODO: What should this error message be?
-    throw new Error('Build script could not be found.');
+    // TODO: Check if user has internet connection.
+    throw new Error(
+      `Build package could not be found at ${registryUrl}. Check internet connection.`
+    );
   }
   if (!packageInfo.data.versions[version]) {
     throw new Error(`Invalid Lowdefy version. Version "${version}" does not exist.`);
@@ -31,8 +34,10 @@ async function loadBuildScriptToCache(version, cachePath) {
     responseType: 'arraybuffer',
   });
   if (!tarball || !tarball.data) {
-    // TODO: What should this error message be?
-    throw new Error('Build script could not be fetched.');
+    /// TODO: Check if user has internet connection.
+    throw new Error(
+      `Build script could not be fetched from ${packageInfo.data.versions[version].dist.tarball}. Check internet connection.`
+    );
   }
   await decompress(tarball.data, cachePath, {
     plugins: [decompressTargz()],
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 241a0f7fb..78201526c 100755
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -36,7 +36,7 @@ program
 
 program
   .command('clean-cache')
-  .description('Build a Lowdefy deployment.')
+  .description('Clean cached scripts and block meta descriptions.')
   .usage(`[options]`)
   .option(
     '--base-directory <base-directory>',