diff --git a/pom.xml b/pom.xml
index 4a6c4f0..352800f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>de.jaschastarke</groupId>
   <artifactId>LimitedCreative</artifactId>
   <name>LimitedCreative</name>
-  <version>2.1</version>
+  <version>2.1.1-SNAPSHOT</version>
   <url>https://github.com/possi/LimitedCreative</url>
   
   <properties>
diff --git a/src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/SyncronizedModel.java b/src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/SyncronizedModel.java
index 7a5633f..40beffe 100644
--- a/src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/SyncronizedModel.java
+++ b/src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/SyncronizedModel.java
@@ -135,21 +135,15 @@ public class SyncronizedModel extends AbstractModel implements DBModel {
     }
     public void setState(BlockState state) {
         Block block = state.getLocation().getBlock();
-        boolean update = hasMetaBlock(block);
-        boolean store = state.isRestricted() || mod.getConfig().getLogSurvival();
+        boolean store = state != null && (state.isRestricted() || mod.getConfig().getLogSurvival());
         
         setMetaBlock(block, store ? state : null);
         
         try {
-            if (update) {
-                if (!store)
-                    q.delete(state);
-                else if (!q.update(state))
-                    q.insert(state);
-            } else {
-                if (store)
-                    q.insert(state);
-            }
+            if (!store)
+                q.delete(state);
+            else if (!q.update(state))
+                q.insert(state);
         } catch (SQLException e) {
             mod.getLog().severe(e.getMessage());
             mod.getLog().warn("Failed to update BlockState in DB at " + block.getLocation().toString());