diff --git a/spongyd/network.go b/spongyd/network.go
index d9be315..dd9548a 100644
--- a/spongyd/network.go
+++ b/spongyd/network.go
@@ -191,14 +191,13 @@ func (nw *Network) messageDispatchLoop() {
 
 		handlerPath := path.Join(nw.basePath, "handler")
 		cmd := exec.Command(handlerPath, m.Args...)
-		cmd.Env = []string{
-			"command=" + m.Command,
-			"fullsender=" + m.FullSender,
-			"sender=" + m.Sender,
-			"forum=" + m.Forum,
-			"text=" + m.Text,
-			"raw=" + line,
-		}
+		cmd.Env = os.Environ()
+		cmd.Env = append(cmd.Env, "command=" + m.Command)
+		cmd.Env = append(cmd.Env, "fullsender=" + m.FullSender)
+		cmd.Env = append(cmd.Env, "sender=" + m.Sender)
+		cmd.Env = append(cmd.Env, "forum=" + m.Forum)
+		cmd.Env = append(cmd.Env, "text=" + m.Text)
+		cmd.Env = append(cmd.Env, "raw=" + line)
 		cmd.Stderr = os.Stderr
 		out, err := cmd.Output()
 		if err != nil {
diff --git a/spongyd/spongyd.go b/spongyd/spongyd.go
index bc6f85c..647e78c 100644
--- a/spongyd/spongyd.go
+++ b/spongyd/spongyd.go
@@ -104,4 +104,5 @@ func main() {
 	runsvdir(basePath)
 	
 	running = false
+	log.Print("Exiting for some reason!")
 }