Updating: handling functions that do not return.