Import submodule updates for core

Better exception handling