Merge "Update exception thrown for keystore" into main