diff --git a/thefuck/shells/powershell.py b/thefuck/shells/powershell.py
index 8e5d994d..bf954bf3 100644
--- a/thefuck/shells/powershell.py
+++ b/thefuck/shells/powershell.py
@@ -3,11 +3,14 @@ from .generic import Generic
 
 class Powershell(Generic):
     def app_alias(self, fuck):
-        return 'function ' + fuck + ' { \n' \
-               '    $fuck = $(thefuck (Get-History -Count 1).CommandLine);\n' \
-               '    if (-not [string]::IsNullOrWhiteSpace($fuck)) {\n' \
-               '        if ($fuck.StartsWith("echo")) { $fuck = $fuck.Substring(5); }\n' \
-               '        else { iex "$fuck"; }\n' \
+        return 'function ' + fuck + ' {\n' \
+               '    $history = (Get-History -Count 1).CommandLine;\n' \
+               '    if (-not [string]::IsNullOrWhiteSpace($history)) {\n' \
+               '        $fuck = $(thefuck $history);\n' \
+               '        if (-not [string]::IsNullOrWhiteSpace($fuck)) {\n' \
+               '            if ($fuck.StartsWith("echo")) { $fuck = $fuck.Substring(5); }\n' \
+               '            else { iex "$fuck"; }\n' \
+               '        }\n' \
                '    }\n' \
                '}\n'