diff --git a/go2tv.go b/go2tv.go
index 956d378..a878c98 100644
--- a/go2tv.go
+++ b/go2tv.go
@@ -79,8 +79,8 @@ func main() {
 		fmt.Fprintf(os.Stderr, "Encountered error(s): %s\n", err)
 		os.Exit(1)
 	}
-	initializeCloseHandler(*tvdata)
 
+	initializeCloseHandler(*tvdata)
 	// Sleep forever
 	select {}
 }
diff --git a/soapcalls/dmrparser.go b/soapcalls/dmrparser.go
index 1ccc4bb..1ba2174 100644
--- a/soapcalls/dmrparser.go
+++ b/soapcalls/dmrparser.go
@@ -57,7 +57,6 @@ func AVTransportFromDMRextractor(dmrurl string) (string, error) {
 			avtransportURL := parsedURL.Scheme + "://" + parsedURL.Host + root.Device.ServiceList.Services[i].ControlURL
 			return avtransportURL, nil
 		}
-
 	}
 	return "", errors.New("Something broke somewhere - wrong DMR URL?")
 }