diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 61c9edc9ff..058ea0541f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -76,6 +76,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         else if (entity instanceof EntityFireball) { return new CraftFireball( server, (EntityFireball) entity); }
         else if (entity instanceof EntityFish) { return new CraftFish( server, (EntityFish) entity); }
         else if (entity instanceof EntityItem) { return new CraftItem( server, (EntityItem) entity); }
+        else if (entity instanceof EntityWeather) {
+            if (entity instanceof EntityWeatherStorm) {
+                return new CraftWeatherStorm(server, (EntityWeatherStorm)entity);
+            } else {
+                return new CraftWeather(server, (EntityWeather)entity);
+            }
+        }
         else if (entity instanceof EntityMinecart) {
             EntityMinecart mc = (EntityMinecart) entity;
             if (mc.type == CraftMinecart.Type.StorageMinecart.getId()) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWeather.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWeather.java
new file mode 100644
index 0000000000..da4208d6ab
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWeather.java
@@ -0,0 +1,17 @@
+
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityWeather;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Weather;
+
+public class CraftWeather extends CraftEntity implements Weather {
+    public CraftWeather(final CraftServer server, final EntityWeather entity) {
+        super(server, entity);
+    }
+
+    @Override
+    public EntityWeather getHandle() {
+        return (EntityWeather)super.getHandle();
+    }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWeatherStorm.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWeatherStorm.java
new file mode 100644
index 0000000000..aacbb3dabe
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWeatherStorm.java
@@ -0,0 +1,17 @@
+
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityWeatherStorm;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.WeatherStorm;
+
+public class CraftWeatherStorm extends CraftEntity implements WeatherStorm {
+    public CraftWeatherStorm(final CraftServer server, final EntityWeatherStorm entity) {
+        super(server, entity);
+    }
+
+    @Override
+    public EntityWeatherStorm getHandle() {
+        return (EntityWeatherStorm)super.getHandle();
+    }
+}