diff --git a/auth/request.go b/auth/request.go
index bfb2a6c69be58251fbb2f2a67defa4e9265d85fd..76af994787f8e1658e13345bf14883e091e7790d 100644
--- a/auth/request.go
+++ b/auth/request.go
@@ -57,10 +57,13 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader,
 
 	if err == nil {
 		if rqType == auth.Receive {
-			return 0, errors.WithMessage(err,
-				"Cannot send a request after receiving a request")
+			return 0, errors.Errorf("Cannot send a request after " +
+				"receiving a request")
 		} else if rqType == auth.Sent {
 			resend = true
+		}else{
+			return 0, errors.Errorf("Cannot send a request after " +
+				" a stored request with unknown rqType: %d", rqType)
 		}
 	}else if !strings.Contains(err.Error(), auth.NoRequest){
 		return 0, errors.WithMessage(err,