Revert "Fix NPE for invalid target exception"

This reverts commit d4fda02dd59adff9553dca5647ebb6c023145d5f.

Change-Id: I73341dc41c7effaa3209107b4e85503b17e2c826
1 file changed