Wrap all responsed + improve error handling