- Fix critical NullPointer Exception