WIP Remove try/except block