diff --git a/matterhook/matterhook.go b/matterhook/matterhook.go
index efc77cc0..8e87cc7b 100644
--- a/matterhook/matterhook.go
+++ b/matterhook/matterhook.go
@@ -71,6 +71,11 @@ func (c *Client) StartServer() {
 
 // ServeHTTP implementation.
 func (c *Client) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		log.Println("invalid " + r.Method + " connection from " + r.RemoteAddr)
+		http.NotFound(w, r)
+		return
+	}
 	msg := IMessage{}
 	err := r.ParseForm()
 	if err != nil {
@@ -86,6 +91,11 @@ func (c *Client) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		http.NotFound(w, r)
 		return
 	}
+	if msg.Token == "" {
+		log.Println("no token from " + r.RemoteAddr)
+		http.NotFound(w, r)
+		return
+	}
 	c.In <- msg
 }