Better Error Handling

Sort of