Fixed More Error Handling