Fixing null/None issue in selective retry, now passes tests