diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7a648fae9..38347595b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 NativeScript CLI Changelog
 ================
 
+1.0.2 (2015, May 26)
+==
+
+### Fixed
+
+* [Fixed #498](https://github.com/NativeScript/nativescript-cli/issues/498): On some Linux and OS X systems, when the USER or SUDO_USER environment variables are missing, you cannot run NativeScript CLI commands. The following error appears when you attempt to run `nativescript` or `tns` commands: `TypeError: Arguments to path.join must be strings`.
+
 1.0.1 (2015, May 8)
 ==
 
diff --git a/lib/common b/lib/common
index cff3bdbb13..f11ecb9071 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit cff3bdbb138c47da2124681df1681a8073a265d5
+Subproject commit f11ecb9071bee846bd0964da3cdf59ba41c214b1
diff --git a/package.json b/package.json
index 2f3fb2fcb8..5268cc0a71 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {