diff --git a/test.go b/test.go
index 56446b4..967c954 100644
--- a/test.go
+++ b/test.go
@@ -2,23 +2,38 @@ package main
 
 import (
 	"os"
-	path "path/filepath"
 	"os/exec"
+	path "path/filepath"
 	"time"
-	"bytes"
+
+//	"bytes"
 )
 
 var cmdTest = &Command{
 	UsageLine: "test [appname]",
 	Short:     "test the app",
-	Long: ``,
+	Long:      ``,
 }
 
 func init() {
 	cmdTest.Run = testApp
 }
 
-var started= make(chan bool)
+func safePathAppend(arr []string, paths ...string) []string {
+	for _, path := range paths {
+		if pathExists(path) {
+			arr = append(arr, path)
+		}
+	}
+	return arr
+}
+
+func pathExists(path string) bool {
+	_, err := os.Stat(path)
+	return err == nil || os.IsExist(err)
+}
+
+var started = make(chan bool)
 
 func testApp(cmd *Command, args []string) {
 	if len(args) != 1 {
@@ -34,7 +49,7 @@ func testApp(cmd *Command, args []string) {
 		colorLog("[ERRO] Fail to parse bee.json[ %s ]", err)
 	}
 	var paths []string
-	paths = append(paths,
+	paths = safePathAppend(paths,
 		path.Join(crupath, conf.DirStruct.Controllers),
 		path.Join(crupath, conf.DirStruct.Models),
 		path.Join(crupath, "./")) // Current path.
@@ -50,32 +65,37 @@ func testApp(cmd *Command, args []string) {
 		select {
 		case <-started:
 			runTest()
-			Kill()
-			os.Exit(0)
+			//Kill()
+			//os.Exit(0)
 		}
 	}
 }
 
-func runTest(){
+func runTest() {
 	colorLog("[INFO] Start testing...\n")
-	time.Sleep(time.Second*5)
-	path, _ := os.Getwd()
-	os.Chdir(path+"/tests")
+	time.Sleep(time.Second * 1)
+	crupwd, _ := os.Getwd()
+	testDir := path.Join(crupwd, "tests")
+	if pathExists(testDir) {
+		os.Chdir(testDir)
+	}
 
 	var err error
 	icmd := exec.Command("go", "test")
-	var out,errbuffer bytes.Buffer
-	icmd.Stdout = &out
-	icmd.Stderr = &errbuffer
-	colorLog("[INFO] ============== Test Begin ===================\n")
+	//var out,errbuffer bytes.Buffer
+	//icmd.Stdout = &out
+	//icmd.Stderr = &errbuffer
+	icmd.Stdout = os.Stdout
+	icmd.Stderr = os.Stderr
+	colorLog("[TRAC] ============== Test Begin ===================\n")
 	err = icmd.Run()
-	colorLog(out.String())
-	colorLog(errbuffer.String())
-	colorLog("[INFO] ============== Test End ===================\n")
+	//colorLog(out.String())
+	//colorLog(errbuffer.String())
+	colorLog("[TRAC] ============== Test End ===================\n")
 
 	if err != nil {
 		colorLog("[ERRO] ============== Test failed ===================\n")
-		colorLog("[ERRO] " ,err)
+		colorLog("[ERRO] ", err)
 		return
 	}
 	colorLog("[SUCC] Test finish\n")
diff --git a/watch.go b/watch.go
index 34cd6a7..b0c89c3 100644
--- a/watch.go
+++ b/watch.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"github.com/howeyc/fsnotify"
-	"log"
 	"os"
 	"os/exec"
 	"strings"
@@ -51,7 +50,7 @@ func NewWatcher(paths []string) {
 					go Autobuild()
 				}
 			case err := <-watcher.Error:
-				log.Fatal("error:", err)
+				colorLog("[WARN] %s\n", err.Error()) // No need to exit here
 			}
 		}
 	}()
@@ -125,7 +124,7 @@ func Kill() {
 			fmt.Println("Kill -> ", e)
 		}
 	}()
-	if cmd != nil {
+	if cmd != nil && cmd.Process != nil {
 		cmd.Process.Kill()
 	}
 }
@@ -147,7 +146,7 @@ func Start(appname string) {
 	cmd.Stderr = os.Stderr
 
 	go cmd.Run()
-	started<-true
+	started <- true
 }
 
 // checkTMPFile returns true if the event was for TMP files.