Reduced a few layers of error checking per code review