Fixed Exception Handling... I think