diff --git a/sqlupdates/3_0_0 to 3_0_1.sql b/sqlupdates/3_0_0 to 3_0_1.sql
index 9cbec636..71ab3129 100644
--- a/sqlupdates/3_0_0 to 3_0_1.sql	
+++ b/sqlupdates/3_0_0 to 3_0_1.sql	
@@ -8,3 +8,5 @@ INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('console.mode', '1');
 
 -- Youtube Api v3 key to YoutubeManager
 INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('youtube.apikey', '');
+
+INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('hotel.gifts.length.max', '300');
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java
index 13ffb72a..d4093075 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java
@@ -80,6 +80,10 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
                     return;
                 }
 
+                if (message.length() > Emulator.getConfig().getInt("hotel.gifts.length.max", 300)) {
+                    message = message.substring(0, Emulator.getConfig().getInt("hotel.gifts.length.max", 300));
+                }
+
                 Integer iItemId = Emulator.getGameEnvironment().getCatalogManager().giftWrappers.get(spriteId);
 
                 if (iItemId == null)
@@ -172,7 +176,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
                     int limitedNumber = 0;
                     if (item.isLimited()) {
                         count = 1;
-                        if (Emulator.getGameEnvironment().getCatalogManager().getLimitedConfig(item).available() == 0) {
+                        if (Emulator.getGameEnvironment().getCatalogManager().getLimitedConfig(item).available() == 0 && habbo != null) {
                             habbo.getClient().sendResponse(new AlertLimitedSoldOutComposer());
                             return;
                         }
@@ -269,7 +273,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
                                                     return;
                                                 } else {
                                                     if (baseItem.getInteractionType().getType() == InteractionTrophy.class || baseItem.getInteractionType().getType() == InteractionBadgeDisplay.class) {
-                                                        if (baseItem.getInteractionType().getType() == InteractionBadgeDisplay.class && !habbo.getClient().getHabbo().getInventory().getBadgesComponent().hasBadge(extraData)) {
+                                                        if (baseItem.getInteractionType().getType() == InteractionBadgeDisplay.class && habbo != null && !habbo.getClient().getHabbo().getInventory().getBadgesComponent().hasBadge(extraData)) {
                                                             ScripterManager.scripterDetected(habbo.getClient(), Emulator.getTexts().getValue("scripter.warning.catalog.badge_display").replace("%username%", habbo.getClient().getHabbo().getHabboInfo().getUsername()).replace("%badge%", extraData));
                                                             extraData = "UMAD";
                                                         }