Consolodate followup logic in the AbstractBase Controller

fixes issue 1001