diff --git a/src/main.js b/src/main.js
index 8a9e7e4..9b28a43 100644
--- a/src/main.js
+++ b/src/main.js
@@ -177,7 +177,7 @@ const StartWithInputFile = async (inputFile) => {
     return StartServer(null, config);
   } else {
     if (isValidHttpUrl(inputFile)) {
-      console.log(`ERROR: MBTiles does not support web based files. "${inputFile}" is not a valid input file.`,);
+      console.log(`ERROR: MBTiles does not support web based files. "${inputFile}" is not a valid data file.`,);
       process.exit(1);
     }
     const instance = new MBTiles(inputFile + '?mode=ro', (err) => {
diff --git a/src/serve_data.js b/src/serve_data.js
index 7e24a95..f413e4d 100644
--- a/src/serve_data.js
+++ b/src/serve_data.js
@@ -203,9 +203,8 @@ export const serve_data = {
     } else if (params.mbtiles) {
       inputType = 'mbtiles';
       if (isValidHttpUrl(params.mbtiles)) {
-        throw Error(
-          `ERROR: MBTiles does not support web based files. "${params.mbtiles}" is not a valid input file.`,
-        );
+        console.log(`ERROR: MBTiles does not support web based files. "${params.mbtiles}" is not a valid data file.`,);
+        process.exit(1);
       } else {
         inputFile = path.resolve(options.paths.mbtiles, params.mbtiles);
       }
diff --git a/src/server.js b/src/server.js
index c18ad7a..0539685 100644
--- a/src/server.js
+++ b/src/server.js
@@ -235,7 +235,7 @@ function start(opts) {
               for (const id of Object.keys(data)) {
                 if (id === dataId) {
                   fileType = Object.keys(data[id])[0];
-                  if (isValidHttpUrl(inputFile)) {
+                  if (isValidHttpUrl(data[id][fileType])) {
                     inputFile = data[id][fileType];
                   } else {
                     inputFile = path.resolve(