errorhandling, cleanup and add dummy dependency to allow build while legacy-version lying around