diff --git a/cmd/warmer/cmd/root.go b/cmd/warmer/cmd/root.go
index 49850d432..207c0519a 100644
--- a/cmd/warmer/cmd/root.go
+++ b/cmd/warmer/cmd/root.go
@@ -52,6 +52,12 @@ var RootCmd = &cobra.Command{
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
+		if _, err := os.Stat(opts.CacheDir); os.IsNotExist(err) {
+			err = os.MkdirAll(opts.CacheDir, 0755)
+			if err != nil {
+				exit(errors.Wrap(err, "Failed to create cache directory"))
+			}
+		}
 		if err := cache.WarmCache(opts); err != nil {
 			exit(errors.Wrap(err, "Failed warming cache"))
 		}
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
index fe1d3276f..102411c5d 100644
--- a/pkg/cache/cache.go
+++ b/pkg/cache/cache.go
@@ -88,7 +88,7 @@ func (rc *RegistryCache) RetrieveLayer(ck string) (v1.Image, error) {
 	// Layer is stale, rebuild it.
 	if expiry.Before(time.Now()) {
 		logrus.Infof("Cache entry expired: %s", cache)
-		return nil, errors.New(fmt.Sprintf("Cache entry expired: %s", cache))
+		return nil, fmt.Errorf("Cache entry expired: %s", cache)
 	}
 
 	// Force the manifest to be populated
diff --git a/pkg/cache/warm.go b/pkg/cache/warm.go
index ce1f55cb3..abdaec76d 100644
--- a/pkg/cache/warm.go
+++ b/pkg/cache/warm.go
@@ -29,6 +29,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+// WarmCache populates the cache
 func WarmCache(opts *config.WarmerOptions) error {
 	cacheDir := opts.CacheDir
 	images := opts.Images
@@ -41,7 +42,7 @@ func WarmCache(opts *config.WarmerOptions) error {
 			return errors.Wrap(err, fmt.Sprintf("Failed to verify image name: %s", image))
 		}
 		img, err := remote.Image(cacheRef)
-		if err != nil {
+		if err != nil || img == nil {
 			return errors.Wrap(err, fmt.Sprintf("Failed to retrieve image: %s", image))
 		}