Fix NPE on Disable