Merge "Fix bug where credstore is immediately exiting."