Fix for crash in test credential parser
Merge pull request #815 from bhariharan/unstable

Fix for crash in test credential parser