diff --git a/main.go b/main.go
index 270ce36..eaf6415 100644
--- a/main.go
+++ b/main.go
@@ -50,6 +50,9 @@ func parseManifest(manifestPath string) (*Manifest, error) {
 
 
 	manifest.ExtraResources.Workspace = workspaceMap[manifest.ExtraResources.Environment]
+	if manifest.Deployment == nil {
+		manifest.Deployment = &Deployment{}
+	}
 	manifest.Deployment.NameSuffix = DeploymentNameSuffix
 
 	//Fix: Required for templating storage backend
diff --git a/types.go b/types.go
index f602427..66bf05f 100644
--- a/types.go
+++ b/types.go
@@ -8,7 +8,7 @@ type Deployment struct {
 }
 
 type Manifest struct {
-	ExtraResources    *ExtraResources `json:"extraResources"`
+	ExtraResources    *ExtraResources `json:"extraResources" valid:"required"`
 	Team              *Team           `json:"team"`
 	Deployment        *Deployment     `json:"deployment"`
 	StateStoreBackend *StateStoreBackend