Handle potentially bad retention values
Merge pull request #117 from esheffield/master

Handle potentially bad retention values