ARQ-1478: Workaround and testcase for IllegalArgumentException on not found resource