fixed issue where we can wait forever when reporting an error