Squashed commit of Gizmo's Minor fix to prevent application exception.