diff --git a/src/weapon.c b/src/weapon.c
index 9dd20d2..fc5d150 100644
--- a/src/weapon.c
+++ b/src/weapon.c
@@ -318,6 +318,8 @@ static void weapons_updateLayer(const double dt, const WeaponLayer layer) {
     wlayer = wfrontLayer;
     nlayer = &nwfrontLayer;
     break;
+  default:
+    WARN("Unkown weapon layer!");
   }
 
   i = 0;
@@ -400,7 +402,10 @@ void weapons_render(const WeaponLayer layer, const double dt) {
     wlayer = wfrontLayer;
     nlayer = &nwfrontLayer;
     break;
+  default:
+    WARN("Unkown weapon layer!");
   }
+
   for(i = 0; i < (*nlayer); i++)
     weapon_render(wlayer[i], dt);
 }
@@ -852,8 +857,7 @@ void weapon_add(const Outfit* outfit, const double dir, const Vec2* pos,
     mLayer = &mwfrontLayer;
     break;
   default:
-    ERR("Invalid WEAPON_LAYER specified.");
-    return;
+    WARN("Unkown weapon layer!");
   }
   if(*mLayer > *nLayer) /* More memory allocated than what we need. */
     curLayer[(*nLayer)++] = w;
@@ -1016,6 +1020,8 @@ static void weapon_destroy(Weapon* w, WeaponLayer layer) {
     wlayer = wfrontLayer;
     nlayer = &nwfrontLayer;
     break;
+  default:
+    WARN("Unknown weapon layer!");
   }
 
   for(i = 0; (wlayer[i] != w) && (i < *nlayer); i++); /* Get to the current position. */