Maybe we should not throw an exception but delegate to not break existing apps?