diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
index c25f779932..33887a84ed 100644
--- a/pkg/proc/proc_test.go
+++ b/pkg/proc/proc_test.go
@@ -1848,11 +1848,10 @@ func TestIssue414(t *testing.T) {
 			} else {
 				err = p.Next()
 			}
-			if err != nil {
-				if _, exited := err.(proc.ErrProcessExited); exited {
-					break
-				}
+			if _, exited := err.(proc.ErrProcessExited); exited {
+				break
 			}
+
 			assertNoError(err, t, "Step()")
 		}
 	})
diff --git a/pkg/proc/target_exec.go b/pkg/proc/target_exec.go
index 385ce9e25c..9dd71abe74 100644
--- a/pkg/proc/target_exec.go
+++ b/pkg/proc/target_exec.go
@@ -782,11 +782,10 @@ func setStepIntoBreakpoint(dbp *Target, curfn *Function, text []AsmInstruction,
 }
 
 func allowDuplicateBreakpoint(bp *Breakpoint, err error) (*Breakpoint, error) {
-	if err != nil {
-		if _, isexists := err.(BreakpointExistsError); isexists {
-			return bp, nil
-		}
+	if _, isexists := err.(BreakpointExistsError); isexists {
+		return bp, nil
 	}
+
 	return bp, err
 }