added null check
Merge branch 'develop_2.0' of github.com:swagger-api/swagger-codegen into develop_2.0