Workaround and testcase for IllegalArgumentException on not found resource

Patch for ARQ-1478