diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d5241f82629f7..0000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-These additional terms and conditions supplement the terms and conditions
-contained in the AWS Customer Agreement between you and Amazon Web Services,
-Inc. (the “Agreement”), and apply to your participation in the Beta Service
-described below. Without limitation, Section 1.10 of the Service Terms describes
-additional terms and conditions applicable to this Beta Service. IF YOU DO NOT
-AGREE TO THE ADDITIONAL TERMS AND CONDITIONS IN THIS DOCUMENT, YOU MAY NOT USE
-THE BETA SERVICE.
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000000000..cffd0c22b8241
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,30 @@
+## AWS CDK BETA SERVICE ADDENDUM
+
+These additional terms and conditions supplement the terms and conditions
+contained in the AWS Customer Agreement between you and Amazon Web Services,
+Inc. (the “Agreement”), and apply to your participation in the Beta Service
+described below. Without limitation, Section 1.10 of the Service Terms describes
+additional terms and conditions applicable to this Beta Service. IF YOU DO NOT
+AGREE TO THE ADDITIONAL TERMS AND CONDITIONS IN THIS DOCUMENT, YOU MAY NOT USE
+THE BETA SERVICE.
+
+__Name of Beta Service__: AWS Cloud Development Kit (the “CDK”)
+
+__Term of Beta Service__: From 06/18/2018 until general availability of the
+CDK or as may be terminated early in accordance with the Agreement.
+
+__Cost or Charges for use of the Beta Service__: There is no charge to use the
+CDK. You are only charged for the AWS resources you deploy using the CDK. These
+charges will vary based on your use.  The latest pricing for AWS services can be
+found at: https://aws.amazon.com/pricing/services
+
+__Additional Terms and Conditions__:
+
+  * You may not use the CDK for any critical use case.
+  * Load testing, stress testing, benchmarking or similar use of the CDK is
+    prohibited.
+  * Any infrastructure code libraries or other content or materials that you
+    create with the CDK might not be migrated or supported in the generally
+    available versions of the CDK.
+  * The CDK is a Beta Material and may only be used as described in Section 1.10
+    of the Service Terms.
diff --git a/NOTICE b/NOTICE
index 219fa2e56a04f..d1b9a875aef4a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
 AWS Cloud Development Kit – Beta
 Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-See LICENSE file for license terms.
\ No newline at end of file
+See LICENSE.md file for license terms.
\ No newline at end of file
diff --git a/README.md b/README.md
index faa92f938f176..b1503575e57e2 100644
--- a/README.md
+++ b/README.md
@@ -204,4 +204,5 @@ To vend another language for the CDK (given there's jsii support for it):
 # License
 
 Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-See [LICENSE](./LICENSE) file for license terms.
+
+See [LICENSE](./LICENSE.md) file for license terms.
diff --git a/update-version.sh b/update-version.sh
index a23feb9f315e6..e3583d195f238 100755
--- a/update-version.sh
+++ b/update-version.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # HACK: lerna needs a git repo to work but publish will work nevertheless
 git init
@@ -9,7 +10,7 @@ commit="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
 # CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local build or CodePipeline build),
 # use the HEAD commit hash
 if [ -z "${commit}" ]; then
-  commit="$(git rev-parse --verify HEAD)"
+  commit="$(git rev-parse --verify HEAD || echo "head")"
 fi
 
 exec node_modules/.bin/lerna publish --skip-git --skip-npm --repo-version=${version}-beta+${commit:0:7} --yes