Ensure return is completed