start fixing Exceptions (after reworking data model)