Handle null constructor parameters, see #3486