Fractionally better error handling