Merge "Avoid IllegalArgument on missing source"