diff --git a/src/events/gameMaster/mapEditor/create.ts b/src/events/gameMaster/mapEditor/create.ts
index 3adc851..0085419 100644
--- a/src/events/gameMaster/mapEditor/create.ts
+++ b/src/events/gameMaster/mapEditor/create.ts
@@ -18,6 +18,16 @@ export default class MapCreateEvent extends BaseEvent {
 
       this.logger.info(`GM ${(await this.getCharacter())!.getId()} has created a new map via map editor.`)
 
+      if (data.name === '') {
+        this.socket.emit('notification', { message: 'Map name cannot be empty.' })
+        return callback(false)
+      }
+
+      if (data.width < 1 || data.height < 1) {
+        this.socket.emit('notification', { message: 'Map width and height must be greater than 0.' })
+        return callback(false)
+      }
+
       const map = new Map()
       await map
         .setName(data.name)