diff --git a/http/routing/groups.go b/http/routing/groups.go
index d50f291..a20a668 100644
--- a/http/routing/groups.go
+++ b/http/routing/groups.go
@@ -67,6 +67,9 @@ func PublicGroup(s *response.Session, h http.Header, r *http.Request) rsvp.Respo
 		log.Printf("Couldn't get group: %s\n", err)
 		return response.Error(http.StatusInternalServerError, "An error occurred while fetching this group :(")
 	}
+	if group == nil {
+		return response.Error(http.StatusNotFound, "Group not found")
+	}
 	p := GroupProps{
 		Group: group,
 	}