Fix a reported NPE
Match the updated submodules