diff --git a/libpod/container.go b/libpod/container.go
index 0582fa6d..ad4ee0f7 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -270,8 +270,10 @@ func (c *Container) Create() (err error) {
 
 	// If using containers/storage, mount the container
 	if !c.config.RootfsFromImage {
-		// TODO implemented directory-based root filesystems
-		return ErrNotImplemented
+		// TODO implement directory-based root filesystems
+		if !c.state.Mounted {
+			return ErrNotImplemented
+		}
 	} else {
 		mountPoint, err := c.runtime.storageService.StartContainer(c.ID())
 		if err != nil {
diff --git a/libpod/storage.go b/libpod/storage.go
index 09378fcf..f0bf9e9c 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -45,9 +45,9 @@ type RuntimeContainerMetadata struct {
 	ImageName string `json:"image-name"` // Applicable to both PodSandboxes and Containers
 	ImageID   string `json:"image-id"`   // Applicable to both PodSandboxes and Containers
 	// The container's name, which for an infrastructure container is usually PodName + "-infra".
-	ContainerName string `json:"name"` // Applicable to both PodSandboxes and Containers, mandatory
-	CreatedAt    int64  `json:"created-at"`           // Applicable to both PodSandboxes and Containers
-	MountLabel   string `json:"mountlabel,omitempty"` // Applicable to both PodSandboxes and Containers
+	ContainerName string `json:"name"`                 // Applicable to both PodSandboxes and Containers, mandatory
+	CreatedAt     int64  `json:"created-at"`           // Applicable to both PodSandboxes and Containers
+	MountLabel    string `json:"mountlabel,omitempty"` // Applicable to both PodSandboxes and Containers
 }
 
 // SetMountLabel updates the mount label held by a RuntimeContainerMetadata