[Tim] -X Added fix for broken apk null pointer exception.