diff --git a/src/bgtask.js b/src/bgtask.js
index 5ff28b8a..cdd1fd1e 100644
--- a/src/bgtask.js
+++ b/src/bgtask.js
@@ -44,6 +44,10 @@ function initChannelDumper(Server) {
     var CHANNEL_SAVE_INTERVAL = parseInt(Config.get("channel-save-interval"))
                                 * 60000;
     setInterval(function () {
+        if (Server.channels.length === 0) {
+            return;
+        }
+
         var wait = CHANNEL_SAVE_INTERVAL / Server.channels.length;
         LOGGER.info(`Saving channels with delay ${wait}`);
         Promise.reduce(Server.channels, (_, chan) => {
diff --git a/src/database.js b/src/database.js
index 2170edfb..82bfdb6c 100644
--- a/src/database.js
+++ b/src/database.js
@@ -138,6 +138,10 @@ module.exports.query = function (query, sub, callback) {
         }).catch(error => {
             queryErrorCount.inc(1);
 
+            if (!sub) {
+                sub = [];
+            }
+
             let subs = JSON.stringify(sub);
             if (subs.length > 100) {
                 subs = subs.substring(0, 100) + '...';
diff --git a/src/ffmpeg.js b/src/ffmpeg.js
index 41b48383..b69aef99 100644
--- a/src/ffmpeg.js
+++ b/src/ffmpeg.js
@@ -28,6 +28,10 @@ const ECODE_MESSAGES = {
         "The remote server's network is unreachable from this server.  " +
         "Please contact an administrator for assistance."
     ),
+    EHOSTUNREACH: e => (
+        "The remote server is unreachable from this server.  " +
+        "Please contact the video server's administrator for assistance."
+    ),
 
     DEPTH_ZERO_SELF_SIGNED_CERT: e => (
         'The remote server provided an invalid ' +
diff --git a/src/logger.js b/src/logger.js
index 5698e6ca..fbf12e83 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -2,7 +2,6 @@
 
 var fs = require("graceful-fs");
 var path = require("path");
-import { sprintf } from 'sprintf-js';
 import { Logger as JsliLogger, LogLevel } from '@calzoneman/jsli';
 import jsli from '@calzoneman/jsli';