Fixed: Potential NPE