PR for code review

What is this block for? What should happen if an exception is caught?
Remove if this is not needed :bow: