Merge "Return null on getPrivateKey failure not exception"