diff --git a/HISTORY.rst b/HISTORY.rst
index 25b3928c..27a5f5e3 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,6 +5,7 @@ Release History
 ------------------
 
 * Fixed an issue with ``--json-output`` (`issue #42 <https://github.com/ivankravets/platformio/issues/42>`_)
+* Fixed an exception during `platformio upgrade <http://docs.platformio.org/en/latest/userguide/cmd_upgrade.html>`__ under Windows OS (`issue #45 <https://github.com/ivankravets/platformio/issues/45>`_)
 
 0.10.1 (2015-01-02)
 -------------------
diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py
index 212744a6..75172ccf 100644
--- a/platformio/commands/upgrade.py
+++ b/platformio/commands/upgrade.py
@@ -23,9 +23,19 @@ def cli():
             "newest version available." % __version__, fg="green"
         )
     else:
-        result = exec_command(["pip", "install", "--upgrade", "platformio"])
-        click.secho(result['out'], fg="green")
-        click.secho(result['err'], fg="red")
+        click.secho("Please wait while upgrading PlatformIO ...",
+                    fg="yellow")
+
+        pip_result = exec_command(["pip", "install", "--upgrade",
+                                   "platformio"])
+        pio_result = exec_command(["platformio", "--version"])
+
+        if last in pio_result['out'].strip():
+            click.secho("PlatformIO has been successfully upgraded to %s" %
+                        last, fg="green")
+        else:
+            click.secho(pip_result['out'], fg="green")
+            click.secho(pip_result['err'], fg="red")
 
 
 def get_latest_version():