Remove some default values.
Handle error and abort the same way.
Add retry count maximum.