diff --git a/container.go b/container.go
index c6b7c8a51c..e552fba036 100644
--- a/container.go
+++ b/container.go
@@ -606,7 +606,6 @@ func (container *Container) waitLxc() error {
 		}
 		time.Sleep(500 * time.Millisecond)
 	}
-	return nil
 }
 
 func (container *Container) monitor() {
@@ -795,7 +794,6 @@ func (container *Container) WaitTimeout(timeout time.Duration) error {
 	case <-done:
 		return nil
 	}
-	panic("unreachable")
 }
 
 func (container *Container) EnsureMounted() error {
diff --git a/network.go b/network.go
index 77a82ed9f0..dbf5480f1c 100644
--- a/network.go
+++ b/network.go
@@ -258,7 +258,6 @@ func proxy(listener net.Listener, proto, address string) error {
 		utils.Debugf("Connected to backend, splicing")
 		splice(src, dst)
 	}
-	return nil
 }
 
 func halfSplice(dst, src net.Conn) error {