Merge "Better errors from copyResource"