* Fixed regression in last commit: If we don't check for existance we'll get