diff --git a/build.sh b/build.sh
index 967571a..4495fd2 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+git submodule update --init --recursive
+
 rm debug release 2>/dev/null || true
 find src | grep -E "\.template$" | while read FILE; do
 	ruby tools/builder/tools/embed.rb "$FILE"
diff --git a/src/model/server.c b/src/model/server.c
index 12d168a..408aa1a 100644
--- a/src/model/server.c
+++ b/src/model/server.c
@@ -42,6 +42,9 @@ void app_args_refresh_tor_hidden_service()
 	g_server->tor_hidden_service = NULL;
 
 	FILE* f = fopen("data/tor/hidden_service/hostname","r");
+	if( !f ) {
+		return;
+	}
 	size_t n;
 	getline( &g_server->tor_hidden_service, &n, f );
 	n = strlen( g_server->tor_hidden_service );