gc - adding exception aspect
gc - fixing mysterious merge conflict