Log errors on caps responses
Removed TODO
Merge branch 'master' into caps