Merge "Prevent potential crash on blond transfer."