Fix for NPE associated with External target.