Also a little improved debugging output of bad resource identifiers. Change-Id: I054064ef22855608ffd722e4ccf12ce57d1992b2