added nil check
Updated submodules