Maintained basic flow of code, but with informative traceback