diff --git a/changelog b/changelog
index ae8a9971b..52e58f96e 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,15 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
+Version 1.5.4
+-----------
+- Fix for NPE if sub_error is null.
+- Picks up common@2.0.12
+
 Version 1.5.3
 -----------
 - Changes to delete RT on bad_token suberror.
 - Picks up common@2.0.11
 
-
 Version 1.5.2
 ------------
 - Broker Content Provider Changes
diff --git a/common b/common
index a55243304..c4a5777d4 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a55243304dda32f72fe3713a96c5bbd1361057ad
+Subproject commit c4a5777d4727cc9103d440228fabdfb73048d8ec
diff --git a/msal/build.gradle b/msal/build.gradle
index 82db86bef..7fb2d8001 100644
--- a/msal/build.gradle
+++ b/msal/build.gradle
@@ -148,9 +148,9 @@ dependencies {
         transitive = false
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '2.0.11', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '2.0.12', changing: true)
 
-    distApi("com.microsoft.identity:common:2.0.11") {
+    distApi("com.microsoft.identity:common:2.0.12") {
         transitive = false
     }
 }
diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties
index 7063baf42..4863e6737 100644
--- a/msal/versioning/version.properties
+++ b/msal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=1.5.3
+versionName=1.5.4
 versionCode=0