Scaling back on logging; fix potential null pointer dereference
fix log message
Merge pull request #166 from pantheon-systems/fix-retry

Fix retry