yeah, I should may be change that.
You can do it and merge if you feel like, make sure you catch only timeouts.