diff --git a/proctl/proctl.go b/proctl/proctl.go
index 91269350d7fc42ba0e81adab0632f4c8047b0dc0..5874518615a949e031f97033ea07669ded1674f1 100644
--- a/proctl/proctl.go
+++ b/proctl/proctl.go
@@ -258,7 +258,7 @@ func (dbp *DebuggedProcess) next() error {
 	var goroutineExiting bool
 	for _, th := range dbp.Threads {
 		if th.blocked() { // Continue threads that aren't running go code.
-			if err := th.Continue(); err != nil {
+			if err = th.Continue(); err != nil {
 				return err
 			}
 			continue
diff --git a/proctl/threads.go b/proctl/threads.go
index 078a575549e59499667d59747358ca538313a761..2938b1f0ff6697ad235d9ce3b2169bc8c4f5dedb 100644
--- a/proctl/threads.go
+++ b/proctl/threads.go
@@ -123,14 +123,14 @@ func (thread *ThreadContext) CallFn(name string, fn func() error) error {
 	}
 	defer thread.Process.Clear(bp.Addr)
 
-	if err := thread.saveRegisters(); err != nil {
+	if err = thread.saveRegisters(); err != nil {
 		return err
 	}
 	if err = thread.SetPC(f.Entry); err != nil {
 		return err
 	}
 	defer thread.restoreRegisters()
-	if err := thread.Continue(); err != nil {
+	if err = thread.Continue(); err != nil {
 		return err
 	}
 	if _, err = trapWait(thread.Process, -1); err != nil {