Compute resources error handling fixes

this PR replaces #678 and #676