Handling DBNull value
Merge branch 'develop'