diff --git a/Organic/Assembler.cs b/Organic/Assembler.cs
index 19a2837..44b8fe4 100644
--- a/Organic/Assembler.cs
+++ b/Organic/Assembler.cs
@@ -591,16 +591,21 @@ public List<ListEntry> Assemble(string code, string FileName)
                     }
                     else
                     {
+                        if (opcode.valueA == null || (!nonBasic && opcode.valueB == null))
+                        {
+                            listEntry.ErrorCode = ErrorCode.InsufficientParamters;
+                            output.Add(listEntry);
+                            continue;
+                        }
+
                         listEntry.Opcode = opcode;
                         StringMatch valueA = null, valueB = null;
                         listEntry.Output = new ushort[1];
                         if (!nonBasic)
                         {
                             listEntry.CodeType = CodeType.BasicInstruction;
-                            if (opcode.valueA != null)
-                                valueA = MatchString(opcode.valueA, ValueTable);
-                            if (opcode.valueB != null)
-                                valueB = MatchString(opcode.valueB, ValueTable);
+                            valueA = MatchString(opcode.valueA, ValueTable);
+                            valueB = MatchString(opcode.valueB, ValueTable);
                             if (valueA.value == valueB.value && valueA.value != 0x1E && valueB.value != 0x1E)
                                 listEntry.WarningCode = WarningCode.RedundantStatement;
                             if (valueB.value == 0x1F && !opcode.match.Contains("IF"))
@@ -634,8 +639,7 @@ public List<ListEntry> Assemble(string code, string FileName)
                         else
                         {
                             listEntry.CodeType = CodeType.NonBasicInstruction;
-                            if (opcode.valueA != null)
-                                valueA = MatchString(opcode.valueA, ValueTable);
+                            valueA = MatchString(opcode.valueA, ValueTable);
                             listEntry.ValueA = valueA;
                             // De-localize labels
                             if (listEntry.ValueA.isLiteral)
diff --git a/Organic/Directives.cs b/Organic/Directives.cs
index 98f5a70..b0617ca 100644
--- a/Organic/Directives.cs
+++ b/Organic/Directives.cs
@@ -404,7 +404,7 @@ private void ParseDirectives(List<ListEntry> output, string line)
                                 currentAddress += (ushort)padding.Length;
                         }
                     }
-                    else if (parameters.Length == 1)
+                    else if (parameters.Length < 3)
                         output.Add(new ListEntry(line, FileNames.Peek(), LineNumbers.Peek(), currentAddress, ErrorCode.InsufficientParamters));
                     else
                         output.Add(new ListEntry(line, FileNames.Peek(), LineNumbers.Peek(), currentAddress, ErrorCode.TooManyParamters));