diff --git a/env.c b/env.c
index 5d537b408..dd79b4231 100644
--- a/env.c
+++ b/env.c
@@ -43,7 +43,7 @@
 /**
    Command used to start fishd
 */
-#define FISHD_CMD L"fishd ^/tmp/fish.%s.log"
+#define FISHD_CMD L"if which fishd >/dev/null; fishd ^/tmp/fish.%s.log; end"
 
 #define ENV_NULL L"\x1d"
 
diff --git a/env_universal.c b/env_universal.c
index 26dc429bd..4d8bc09d8 100644
--- a/env_universal.c
+++ b/env_universal.c
@@ -273,7 +273,7 @@ void env_universal_barrier()
 	message_t *msg;
 	fd_set fds;
 
-	if( !init )
+	if( !init || ( env_universal_server.fd == -1 ))
 		return;
 	
 	barrier_reply = 0;