Fix #1280 and #1362 - issues with blank strings in server start/stop