Merge "Fix missing stack trace on checkItemInfoLocked call" into ub-now-mister-ugly