Fixed nullpointer on destroy
Some try