diff --git a/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql b/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql
index 9c90be02..33623da2 100644
--- a/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql
+++ b/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql
@@ -1,12 +1,12 @@
 #DATABASE UPDATE: 2.0.0 RC-2 -> 2.0.0 RC-3
 
-                                                                                                                                          INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('commands.plugins.oldstyle', '0');
+INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('commands.plugins.oldstyle', '0');
 
-                                                                                                                                          ALTER TABLE `emulator_errors`
-                                                                                                                                          ADD COLUMN `version`  varchar(64) NOT NULL AFTER `timestamp`,
-                                                                                                                                          ADD COLUMN `build_hash`  varchar(64) NOT NULL AFTER `version`;
+ALTER TABLE `emulator_errors`
+ADD COLUMN `version`  varchar(64) NOT NULL AFTER `timestamp`,
+ADD COLUMN `build_hash`  varchar(64) NOT NULL AFTER `version`;
 
-                                                                                                                                          INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('scripter.modtool.tickets', '1');
+INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('scripter.modtool.tickets', '1');
 
 ALTER TABLE `items_crackable`
 ADD COLUMN `subscription_duration` int(3) NULL AFTER `required_effect`,
diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java
index 9e51f95c..675495c5 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java
@@ -119,7 +119,7 @@ public class WiredEffectTriggerStacks extends InteractionWiredEffect
     @Override
     public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff)
     {
-        if (stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks)
+        if (stuff != null && stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks)
         {
             return false;
         }
diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
index aadeb5e2..6e0243ed 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
@@ -1691,6 +1691,8 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
                                 }
                             }
 
+                            HabboItem nextTileChair = this.getLowestChair(tileInFront);
+
                             for(RoomUnit unit : unitsOnTile) {
                                 if (rolledUnitIds.contains(unit.getId())) continue;
 
@@ -1722,14 +1724,14 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
                                         tile.setStackHeight(ridingUnit.getZ() + zOffset);
                                         rolledUnitIds.add(ridingUnit.getId());
                                         updatedUnit.remove(ridingUnit);
-                                        messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight(), room));
+                                        messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight() + (nextTileChair != null ? -1 : 0), room));
                                         isRiding = true;
                                     }
                                 }
 
                                 rolledUnitIds.add(unit.getId());
                                 updatedUnit.remove(unit);
-                                messages.add(new RoomUnitOnRollerComposer(unit, roller, unit.getCurrentLocation(), unit.getZ() + (isRiding ? 1 : 0), tile, tile.getStackHeight() + (isRiding ? 1 : 0), room));
+                                messages.add(new RoomUnitOnRollerComposer(unit, roller, unit.getCurrentLocation(), unit.getZ() + (isRiding ? 1 : 0), tile, tile.getStackHeight() + (isRiding ? 1 : 0) + (nextTileChair != null ? -1 : 0), room));
 
                                 if (itemsOnRoller.isEmpty())
                                 {