diff --git a/cmd/hubserver/handler.go b/cmd/hubserver/handler.go
index db8d8aa..a5b6b2f 100644
--- a/cmd/hubserver/handler.go
+++ b/cmd/hubserver/handler.go
@@ -174,13 +174,13 @@ func (handler *subscriptionHandler) handleSubscription(w http.ResponseWriter, r
 		log.Printf("subscribe: async validation with url %s\n", validationURL.String())
 
 		if validateURL(validationURL.String(), ourChallenge) {
-			log.Printf("subscribe: validation valid\n")
+			log.Println("subscribe: validation valid")
 			err = handler.store.Subscribe(topicURL.String(), storage.Subscriber{callbackURL.String(), leaseSeconds, secret, time.Now()})
 			if err != nil {
-				log.Printf("saving suscriber failed: %v", err)
+				log.Printf("saving subscribe failed: %v", err)
 			}
 		} else {
-			log.Printf("subscribe: validation failed\n")
+			log.Println("subscribe: validation failed")
 		}
 	}()
 
@@ -227,17 +227,25 @@ func (handler *subscriptionHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 	mode := r.Form.Get("hub.mode")
 
 	if mode == "subscribe" {
+		log.Println("hub.mode=subscribe")
 		err = handler.handleSubscription(w, r)
-		log.Printf("saving subscribe failed: %v", err)
+		if err != nil {
+			log.Printf("saving subscribe failed: %v", err)
+		}
 		return
 	} else if mode == "unsubscribe" {
+		log.Println("hub.mode=unsubscribe")
 		err = handler.handleUnsubscription(w, r)
-		log.Printf("saving unsubscribe failed: %v", err)
+		if err != nil {
+			log.Printf("saving unsubscribe failed: %v", err)
+		}
 		return
 	} else if mode == "publish" {
 		log.Println("hub.mode=publish received")
 		err = handler.handlePublish(w, r)
-		log.Printf("handling publish failed: %v", err)
+		if err != nil {
+			log.Printf("handling publish failed: %v", err)
+		}
 		return
 	} else {
 		http.Error(w, "Unknown hub.mode", 400)