diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs
index 734e59d124..321229c07f 100644
--- a/common/src/comp/body/object.rs
+++ b/common/src/comp/body/object.rs
@@ -27,7 +27,7 @@ pub enum Body {
     PotionGreen,
     PotionRed,
     Crate,
-    Tent,    
+    Tent,
 }
 
 impl Body {
@@ -63,5 +63,5 @@ const ALL_OBJECTS: [Body; 26] = [
     Body::PotionBlue,
     Body::PotionGreen,
     Body::Crate,
-    Body::Tent,   
+    Body::Tent,
 ];
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 3d7adfb0ce..c3b7b97c82 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -313,7 +313,7 @@ fn handle_spawn(server: &mut Server, entity: EcsEntity, args: String, action: &C
     let (opt_align, opt_id, opt_amount) = scan_fmt!(&args, action.arg_fmt, String, NpcKind, String);
     // This should be just an enum handled with scan_fmt!
     let opt_agent = alignment_to_agent(&opt_align.unwrap_or(String::new()), entity);
-    let objtype = scan_fmt!(&args, action.arg_fmt, String);
+    let _objtype = scan_fmt!(&args, action.arg_fmt, String);
     // Make sure the amount is either not provided or a valid value
     let opt_amount = opt_amount
         .map_or(Some(1), |a| a.parse().ok())
@@ -487,8 +487,11 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action:
             Some("Crate") => comp::object::Body::Crate,
             Some("Tent") => comp::object::Body::Tent,
             Some("Bomb") => comp::object::Body::Bomb,
-            Some(&_) => (return),
-            None => (return),
+            _ => {
+                return server
+                    .clients
+                    .notify(entity, ServerMsg::Chat(String::from("Object not found!")));
+            }
         };
         server.create_object(pos, obj_type).build();
         server
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index 07a7f4f185..5fc1d43bf9 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -547,7 +547,7 @@ impl FigureModelCache {
             object::Body::PotionBlue => ("object/potion_blue.vox", Vec3::new(-2.0, -2.0, 0.0)),
             object::Body::PotionGreen => ("object/potion_green.vox", Vec3::new(-2.0, -2.0, 0.0)),
             object::Body::Crate => ("object/crate.vox", Vec3::new(-7.0, -7.0, 0.0)),
-            object::Body::Tent => ("object/tent.vox", Vec3::new(-18.5, -19.5, 0.0)),            
+            object::Body::Tent => ("object/tent.vox", Vec3::new(-18.5, -19.5, 0.0)),
         };
         Self::load_mesh(name, offset)
     }