diff --git a/otr/otr.go b/otr/otr.go
index 0d18a60..f872a9d 100644
--- a/otr/otr.go
+++ b/otr/otr.go
@@ -417,12 +417,11 @@ func (c *Conversation) Receive(in []byte) (out []byte, encrypted bool, change Se
 					change = SMPSecretNeeded
 					c.smp.saved = &inTLV
 					return
-				} else if err == smpFailureError {
+				}
+				if err == smpFailureError {
 					err = nil
 					change = SMPFailed
-					return
-				}
-				if complete {
+				} else if complete {
 					change = SMPComplete
 				}
 				if reply.typ != 0 {