Moved to optional return.