diff --git a/modules/auxiliary/scanner/winrm/winrm_cmd.rb b/modules/auxiliary/scanner/winrm/winrm_cmd.rb
index de2a1e6ee4..a4a4dcc6b1 100644
--- a/modules/auxiliary/scanner/winrm/winrm_cmd.rb
+++ b/modules/auxiliary/scanner/winrm/winrm_cmd.rb
@@ -26,7 +26,6 @@ class Metasploit3 < Msf::Auxiliary
 	def initialize
 		super(
 			'Name'           => 'WinRM Command Runner',
-			'Version'        => '$Revision$',
 			'Description'    => %q{
 				This module runs arbitrary Windows commands using the WinRM Service
 				},
@@ -50,6 +49,7 @@ class Metasploit3 < Msf::Auxiliary
 			return
 		end
 		streams = winrm_run_cmd(datastore['CMD'])
+		return unless streams.class == Hash
 		print_error streams['stderr'] unless streams['stderr'] == ''
 		print_good streams['stdout']
 		if datastore['SAVE_OUTPUT']
diff --git a/modules/exploits/windows/winrm/winrm_script_exec.rb b/modules/exploits/windows/winrm/winrm_script_exec.rb
index a65a2ba79e..e9fa20e904 100644
--- a/modules/exploits/windows/winrm/winrm_script_exec.rb
+++ b/modules/exploits/windows/winrm/winrm_script_exec.rb
@@ -37,7 +37,6 @@ class Metasploit3 < Msf::Exploit::Remote
 			},
 			'Author'         => [ 'thelightcosine' ],
 			'License'        => MSF_LICENSE,
-			'Version'        => '$Revision$',
 			'Privileged'     => true,
 			'DefaultOptions' =>
 				{