diff --git a/auth/request.go b/auth/request.go
index c43707904f835b19d1e64ba53cb4ec9fe550355f..bfb2a6c69be58251fbb2f2a67defa4e9265d85fd 100644
--- a/auth/request.go
+++ b/auth/request.go
@@ -55,17 +55,17 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader,
 	//lookup if an ongoing request is occurring
 	rqType, sr, _, err := storage.Auth().GetRequest(partner.ID)
 
-	if err != nil && !strings.Contains(err.Error(), auth.NoRequest){
+	if err == nil {
 		if rqType == auth.Receive {
 			return 0, errors.WithMessage(err,
 				"Cannot send a request after receiving a request")
 		} else if rqType == auth.Sent {
 			resend = true
-		}else{
-			return 0, errors.WithMessage(err,
-				"Cannot send a request after receiving unknown error " +
-				"on requesting contact status")
 		}
+	}else if !strings.Contains(err.Error(), auth.NoRequest){
+		return 0, errors.WithMessage(err,
+			"Cannot send a request after receiving unknown error " +
+				"on requesting contact status")
 	}
 
 	grp := storage.E2e().GetGroup()