diff --git a/cmd/localkube/cmd/start.go b/cmd/localkube/cmd/start.go
index cf98181f550e0b405dc19879116a90a93907f8f9..fd7e16beab4635f82b48755577e1bd409527e181 100644
--- a/cmd/localkube/cmd/start.go
+++ b/cmd/localkube/cmd/start.go
@@ -56,7 +56,11 @@ func init() {
 
 func SetupServer(s *localkube.LocalkubeServer) {
 
-	s.GenerateCerts()
+	err := s.GenerateCerts()
+	if err != nil {
+		fmt.Println("Failed to create certificates!")
+		panic(err)
+	}
 
 	// setup etcd
 	etcd, err := s.NewEtcd(localkube.KubeEtcdClientURLs, localkube.KubeEtcdPeerURLs, "kubeetcd", s.GetEtcdDataDirectory())
diff --git a/pkg/localkube/kube2sky/kube2sky.go b/pkg/localkube/kube2sky/kube2sky.go
index 75777b27e19f1d4ca4b3713f483680abdce76c39..5248081e718dadc522ba7a820ae3b7cd334c9fff 100644
--- a/pkg/localkube/kube2sky/kube2sky.go
+++ b/pkg/localkube/kube2sky/kube2sky.go
@@ -36,7 +36,6 @@ import (
 	etcd "github.com/coreos/go-etcd/etcd"
 	"github.com/golang/glog"
 	skymsg "github.com/skynetservices/skydns/msg"
-	//flag "github.com/spf13/pflag"
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/endpoints"
 	"k8s.io/kubernetes/pkg/api/unversioned"
diff --git a/pkg/localkube/localkube.go b/pkg/localkube/localkube.go
index 105f686d3de4a3c7332d1a312f7e878b867f184f..06bd9032cc4ee9325fcc6874916c9c858844136f 100644
--- a/pkg/localkube/localkube.go
+++ b/pkg/localkube/localkube.go
@@ -82,11 +82,11 @@ func (lk LocalkubeServer) GetHostIP() (net.IP, error) {
 	return utilnet.ChooseBindAddress(net.ParseIP("0.0.0.0"))
 }
 
-func (lk LocalkubeServer) GenerateCerts() {
+func (lk LocalkubeServer) GenerateCerts() error {
 
 	if util.CanReadFile(lk.GetPublicKeyCertPath()) && util.CanReadFile(lk.GetPrivateKeyCertPath()) {
-		fmt.Println("Using existing certs")
-		return
+		fmt.Println("Using these existing certs: ", lk.GetPublicKeyCertPath(), lk.GetPrivateKeyCertPath())
+		return nil
 	}
 
 	alternateIPs := []net.IP{lk.ServiceClusterIPRange.IP}
@@ -94,9 +94,13 @@ func (lk LocalkubeServer) GenerateCerts() {
 	hostIP, err := lk.GetHostIP()
 	if err != nil {
 		fmt.Println("Failed to get host IP: ", err)
+		return err
 	}
 
 	if err := utilcrypto.GenerateSelfSignedCert(hostIP.String(), lk.GetPublicKeyCertPath(), lk.GetPrivateKeyCertPath(), alternateIPs, alternateDNS); err != nil {
 		fmt.Println("Failed to create certs: ", err)
+		return err
 	}
+
+	return nil
 }