Merge "Check for NPE when sending enroll result"