Updated Error Handling Bug