Minor fix to avoid unexpected SWT errors