Handle void data type
Merge pull request #5573 from wmtan/HandleVoidProperly

Handle void data type