Merge branch 'hotfix/Null_callbacks'
Merge branch 'release/getCredentials'
Change onError to use respons object