diff --git a/RetailCoder.VBE/UI/RefactorMenu.cs b/RetailCoder.VBE/UI/RefactorMenu.cs
index 0a7ec5617e..bac0d6b1e6 100644
--- a/RetailCoder.VBE/UI/RefactorMenu.cs
+++ b/RetailCoder.VBE/UI/RefactorMenu.cs
@@ -226,7 +226,7 @@ public void ReorderParameters(QualifiedSelection selection)
             using (var view = new ReorderParametersDialog())
             {
                 var parseResult = _parser.Parse(IDE.ActiveVBProject);
-                var presenter = new ReorderParametersPresenter(IDE, view, parseResult, selection);
+                var presenter = new ReorderParametersPresenter(view, parseResult, selection);
                 presenter.Show();
             }
         }
diff --git a/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
index e29264c9df..d9f9d83b19 100644
--- a/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
+++ b/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Microsoft.Vbe.Interop;
@@ -32,6 +33,8 @@ public void Show()
             {
                 LoadParams();
 
+                if (_view.Parameters.Count < 2) { return; }
+
                 _view.InitializeParameterGrid();
                 _view.ShowDialog();
             }
@@ -90,6 +93,11 @@ private void AdjustReferences()
                 }
 
                 var argList = (VBAParser.ArgsCallContext)proc.argsCall();
+
+                if (argList == null)
+                {
+                    continue;
+                }
                 var paramNames = argList.argCall().Select(arg => arg.GetText()).ToList();
 
                 var module = reference.QualifiedModuleName.Component.CodeModule;