Fixed passing null to constuctor
Fixed again