Add more keystore error catch