diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java index 04b13d82..334ddc17 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java @@ -261,7 +261,7 @@ public class TraxManager implements Disposable { public InteractionMusicDisc fromItemId(int itemId) { for (InteractionMusicDisc musicDisc : this.songs) { - if (musicDisc.getId() == itemId) { + if (musicDisc != null && musicDisc.getId() == itemId) { return musicDisc; } }