diff --git a/src/main/java/modtweaker/Commands.java b/src/main/java/modtweaker/Commands.java
index 853c647..3e77f43 100644
--- a/src/main/java/modtweaker/Commands.java
+++ b/src/main/java/modtweaker/Commands.java
@@ -48,7 +48,7 @@ public class Commands {
 			MineTweakerAPI.server.addMineTweakerCommand("lexiconPages", new String[] { "/minetweaker lexiconPages", "/minetweaker lexiconPages [ENTRY]", "    Outputs a list of lexicon pages for the entry" }, new LexiconPageLogger());
 			MineTweakerAPI.server.addMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", "    Outputs a list of keys for botania brews" }, new BotaniaBrewLogger());
 			MineTweakerAPI.server.addMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", "    Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger());
-			MineTweakerAPI.server.addMineTweakerCommand("botaniaOrchids", new String[] { "/minetweaker botaniaOrchids", "    Outputs a list of keys for botania orchid weights" }, new BotaniaOrchidLogger());
+			MineTweakerAPI.server.addMineTweakerCommand("botaniaOrchid", new String[] { "/minetweaker botaniaOrchid", "    Outputs a list of keys for botania orchid weights" }, new BotaniaOrchidLogger());
 		}
 
 
diff --git a/src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java b/src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java
index 1771177..b2314db 100644
--- a/src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java
+++ b/src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java
@@ -63,11 +63,13 @@ public class Hammer {
 			boolean found = false;
 			Iterator<Smashable> smashables = HammerRegistry.rewards.iterator();
 			while (!found && smashables.hasNext()) {
+
 				Smashable reward = smashables.next();
-				if (reward.source == Block.getBlockFromItem(stack.getItem())) {
-					reward.source = Blocks.air;
-					found = true;
-				}
+				if (reward != null && reward.source != null && Block.getBlockFromItem(stack.getItem()) != null)
+					if (reward.source == Block.getBlockFromItem(stack.getItem())) {
+						reward.source = Blocks.air;
+						found = true;
+					}
 			}
 
 			// for (Smashable r : HammerRegistry.rewards.) {