Eliminated Error::last_or_default