Code review PR

This might be unnecessary if you remove the `return` statement and just functionally return the result from the `try`.