Exceptions are now components
cleaning CollectionCtrl code