Handle null type constructors
1.1.6