diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go
index df54dbc..b2bb6af 100644
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@@ -620,9 +620,8 @@ func (cp *cwtchPeer) AddServer(serverSpecification string) (string, error) {
 			}
 			cp.SetConversationAttribute(conversationInfo.ID, attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(string(model.BundleType))), serverSpecification)
 			return onion, err
-		} else {
-			return "", err
 		}
+		return "", err
 	}
 	return "", model.InconsistentKeyBundleError
 }
@@ -750,9 +749,8 @@ func (cp *cwtchPeer) ImportBundle(importString string) error {
 		_, err := cp.NewContactConversation(importString, model.DefaultP2PAccessControl(), true)
 		if err == nil {
 			return ConstructResponse(importBundlePrefix, "success")
-		} else {
-			return ConstructResponse(importBundlePrefix, err.Error())
 		}
+		return ConstructResponse(importBundlePrefix, err.Error())
 	} else if strings.HasPrefix(importString, tofuBundlePrefix) {
 		bundle := strings.Split(importString, "||")
 		if len(bundle) == 2 {