Update submodules
Check for null to prevent NPE
Remove code that was causing app to crash