- Fix potenial NPE crashes

