diff --git a/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs b/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs
index 08b4c374f9..430093ba4e 100644
--- a/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs
+++ b/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs
@@ -1252,7 +1252,9 @@ namespace ICSharpCode.NRefactory.VB
 			else {
 				variableDeclarator.Type.AcceptVisitor(this, data);
 				if (!variableDeclarator.Initializer.IsNull) {
+					Space();
 					WriteToken("=", VariableDeclarator.Roles.Assign);
+					Space();
 					variableDeclarator.Initializer.AcceptVisitor(this, data);
 				}
 			}
@@ -1378,7 +1380,12 @@ namespace ICSharpCode.NRefactory.VB
 		
 		public object VisitThrowStatement(ThrowStatement throwStatement, object data)
 		{
-			throw new NotImplementedException();
+			StartNode(throwStatement);
+			
+			WriteKeyword("Throw");
+			throwStatement.Expression.AcceptVisitor(this, data);
+			
+			return EndNode(throwStatement);
 		}
 		
 		public object VisitIfElseStatement(IfElseStatement ifElseStatement, object data)
diff --git a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
index 054d5a470c..1f4fa1b246 100644
--- a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
+++ b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
@@ -647,7 +647,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors
 		
 		public AstNode VisitThrowStatement(CSharp.ThrowStatement throwStatement, object data)
 		{
-			throw new NotImplementedException();
+			return EndNode(throwStatement, new ThrowStatement((Expression)throwStatement.Expression.AcceptVisitor(this, data)));
 		}
 		
 		public AstNode VisitTryCatchStatement(CSharp.TryCatchStatement tryCatchStatement, object data)