diff --git a/server/serve/new.go b/server/serve/new.go
index 0a47913..fe5cf11 100644
--- a/server/serve/new.go
+++ b/server/serve/new.go
@@ -2,7 +2,7 @@ package serve
 
 import (
 	"local/dynamodb/server/config"
-	"local/s2sa/s2sa/server/router"
+	"local/router"
 	"strings"
 )
 
diff --git a/server/serve/routes.go b/server/serve/routes.go
index 141728e..bdede95 100644
--- a/server/serve/routes.go
+++ b/server/serve/routes.go
@@ -3,8 +3,9 @@ package serve
 import (
 	"io/ioutil"
 	"local/dynamodb/server/config"
-	"local/s2sa/s2sa/server/router"
+	"local/router"
 	"local/storage"
+	"log"
 	"net/http"
 	"path"
 	"strings"
@@ -41,11 +42,18 @@ func (s *Server) NSCatchAll(w http.ResponseWriter, r *http.Request) {
 func (s *Server) get(w http.ResponseWriter, r *http.Request) {
 	db := config.Values().DB
 	ns := strings.Split(r.URL.Path, "/")[1]
-	key := strings.Split(r.URL.Path, "/")[2]
+	var key string
+	if len(strings.Split(r.URL.Path, "/")) < 3 {
+		key = ns
+		ns = ""
+	} else {
+		key = strings.Split(r.URL.Path, "/")[2]
+	}
 	if value, err := db.Get(key, ns); err == storage.ErrNotFound {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	} else if err != nil {
+		log.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	} else {
@@ -67,6 +75,7 @@ func (s *Server) put(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if err := db.Set(key, value, ns); err != nil {
+		log.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}