Move superclass call after null checks