diff --git a/src/java/iced-x86/src/main/java/com/github/icedland/iced/x86/enc/Encoder.java b/src/java/iced-x86/src/main/java/com/github/icedland/iced/x86/enc/Encoder.java
index 5021d6259..09456a055 100644
--- a/src/java/iced-x86/src/main/java/com/github/icedland/iced/x86/enc/Encoder.java
+++ b/src/java/iced-x86/src/main/java/com/github/icedland/iced/x86/enc/Encoder.java
@@ -194,7 +194,7 @@ public final class Encoder {
 		if (!(bitness == 16 || bitness == 32 || bitness == 64))
 			throw new IllegalArgumentException("bitness");
 		if (writer == null)
-			throw new IllegalArgumentException("writer");
+			throw new NullPointerException("writer");
 		immSizes = s_immSizes;
 		this.writer = writer;
 		this.bitness = bitness;