Construction 3 merge 2

Minor fix to handle an annoying exception.