More debugging in keystore Jira Issue: WP-794