diff --git a/main.go b/main.go
index 56c59f0..35b7795 100644
--- a/main.go
+++ b/main.go
@@ -35,21 +35,15 @@ func main() {
 	// Handle termination on ctrl+signalChan
 	signalChan := make(chan os.Signal, 1)
 	signal.Notify(signalChan, os.Interrupt, syscall.SIGTERM)
-
-	go func(errors chan error) {
-		for {
-			select {
-			case <-signalChan:
-				os.Exit(1)
-			case err := <-errors:
-				if err != nil {
-					log.Fatalf("watcherIface.Monitor: %s\n", err)
-					return
-				}
+	for {
+		select {
+		case <-signalChan:
+			os.Exit(1)
+		case err := <-errors:
+			if err != nil {
+				log.Printf("watcherIface.Monitor: %s\n", err)
+				continue
 			}
 		}
-	}(errors)
-
-	// TODO: Improve this: Block main goroutine forever.
-	<-make(chan struct{})
+	}
 }
diff --git a/pkg/watcher/test-script.sh b/test-script.sh
similarity index 100%
rename from pkg/watcher/test-script.sh
rename to test-script.sh