diff --git a/src/main/java/main/util/Generator.java b/src/main/java/main/util/Generator.java
index 6f8fac9..563e679 100644
--- a/src/main/java/main/util/Generator.java
+++ b/src/main/java/main/util/Generator.java
@@ -16,9 +16,12 @@ public class Generator {
     }
 
     public static void generateNetherOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) {
-        generateOre(state, Blocks.NETHERRACK.getDefaultState(),null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize);
+        generateOre(state, Blocks.NETHERRACK.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize);
     }
 
+    public static void generateOre(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) {
+        generateOre(state, replace, null, null, random, chunkX, chunkZ, world, chance, minY, maxY, minSize, maxSize);
+    }
 
     public static void generateOre(IBlockState state, IBlockState replace, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) {
         int size = minSize + random.nextInt(maxSize - minSize);
diff --git a/src/main/java/main/util/StateMatcher.java b/src/main/java/main/util/StateMatcher.java
index b566402..0e8d6fb 100644
--- a/src/main/java/main/util/StateMatcher.java
+++ b/src/main/java/main/util/StateMatcher.java
@@ -21,6 +21,12 @@ public class StateMatcher implements Predicate<IBlockState> {
     }
 
     public boolean apply(IBlockState state) {
-        return state != null && state.getBlock() == this.state.getBlock() && state.getValue(property) == value;
+        if (state != null) {
+            if (property != null && value != null)
+                return state.getBlock() == this.state.getBlock() && state.getValue(property) == value;
+            else
+                return state.getBlock() == this.state.getBlock();
+        }
+        return false;
     }
 }