diff --git a/cmd/ubsserver/main.go b/cmd/ubsserver/main.go
index ffbf7b2..dc98519 100644
--- a/cmd/ubsserver/main.go
+++ b/cmd/ubsserver/main.go
@@ -160,13 +160,18 @@ func updateSync(syncId string, w http.ResponseWriter, req *http.Request) {
 func bookmarks(w http.ResponseWriter, req *http.Request) {
 	elements := strings.Split(strings.Trim(req.URL.Path, "/"), "/")
 
-	if len(elements) == 1 && req.Method == "POST" {
-		log.Println("createSync()")
-		createSync(w, req)
-		return
+	if len(elements) == 1 {
+		if req.Method == "POST" {
+			log.Println("createSync()")
+			createSync(w, req)
+			return
+		} else {
+			sendJSONError(w, syncstore.MethodNotImplementedError)
+			return
+		}
 	}
 	syncId := elements[1]
-	if !sidRe.MatchString(elements[1]) {
+	if !sidRe.MatchString(syncId) {
 		sendJSONError(w, syncstore.NotImplementedError)
 		return
 	}