scd: More fix of error return path.