Updated submodule
Added error handling
Minor bugfixes