diff --git a/build.gradle b/build.gradle
index d81488f..f7fdb9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 apply plugin: 'idea'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "0.8.0-MC1.9.4"
+version = "0.8.1-MC1.9.4"
 group = "at.chaosfield.openradio"
 archivesBaseName = "OpenRadio"
 
diff --git a/src/main/java/at/chaosfield/openradio/OpenRadio.java b/src/main/java/at/chaosfield/openradio/OpenRadio.java
index 636cf62..243a3d4 100644
--- a/src/main/java/at/chaosfield/openradio/OpenRadio.java
+++ b/src/main/java/at/chaosfield/openradio/OpenRadio.java
@@ -19,7 +19,7 @@
  * Created by Jakob Riepler (XDjackieXD)
  */
 
-@Mod(name = "Open Radio", modid = OpenRadio.MODID, version = "0.8.0", modLanguage = "java", dependencies = "required-after:OpenComputers@[1.6.0,)")
+@Mod(name = "Open Radio", modid = OpenRadio.MODID, version = "0.8.1", modLanguage = "java", dependencies = "required-after:OpenComputers@[1.6.0,)")
 public class OpenRadio{
 
     public static final String MODID = "openradio";
diff --git a/src/main/java/at/chaosfield/openradio/entity/LaserEntity.java b/src/main/java/at/chaosfield/openradio/entity/LaserEntity.java
index bc37740..15125d9 100644
--- a/src/main/java/at/chaosfield/openradio/entity/LaserEntity.java
+++ b/src/main/java/at/chaosfield/openradio/entity/LaserEntity.java
@@ -13,8 +13,6 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
@@ -141,7 +139,7 @@ public void onEntityUpdate(){
             int i = this.getMaxInPortalTime();
 
             if(this.inPortal){
-                if(minecraftserver.getAllowNether()){
+                if(minecraftserver != null && minecraftserver.getAllowNether()){
                     if(this.getRidingEntity() == null && this.portalCounter++ >= i){
                         this.portalCounter = i;
                         this.timeUntilPortal = this.getPortalCooldown();