Accidentally merged wrong branch

changes that lead to exceptions