Fix interface of baseclass and null object