Code review fixes, delete RuntimeError and limit loop for 2 tries.