for #62

for #62, exit retry loop for condition where 'key' is None
Merge pull request #67 from ewah/master

for #62