diff --git a/pom.xml b/pom.xml
index 9188505..dafc2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>UltimateStacker</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>2.1</version>
+    <version>2.1.1</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>UltimateStacker-${project.version}</finalName>
diff --git a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
index f94a782..3f8d074 100644
--- a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
+++ b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
@@ -228,6 +228,10 @@ public class UltimateStacker extends SongodaPlugin {
 
     @Override
     public void onDataLoad() {
+        if (HologramManager.isEnabled())
+            // Set the offset so that the holograms don't end up inside the blocks.
+            HologramManager.getHolograms().setPositionOffset(.5,.65,.5);
+
         // Load current data.
         final boolean useSpawnerHolo = Settings.SPAWNER_HOLOGRAMS.getBoolean();
         this.dataManager.getSpawners((spawners) -> {
diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
index f23c565..a8ce55d 100644
--- a/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
+++ b/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
@@ -57,6 +57,7 @@ public class BlockListeners implements Listener {
             boolean isStacked = blockStackManager.isBlock(block.getLocation());
 
             CompatibleMaterial blockType = CompatibleMaterial.getMaterial(block);
+            if (blockType == null) return;
 
             if (isStacked || Settings.STACKABLE_BLOCKS.getStringList().contains(blockType.name())) {
                 BlockStack stack = blockStackManager.getBlock(block, blockType);