Remove unnecessary panic

The compiler is smart enough to know the code is unreachable (found by
running 'go vet').
Add retry test for nil fields
Add additional retry test cases