NPE on disband fixed