New option + checks for add-parents.
Added tests to prove exception is not thrown anymore.