#19 - Remove not need if null in generated code