Updated error handlers for extra params
Removing broken submodules for now