Fix cases with multiple return types including no-type (#436)

Fix cases with multiple return types including no-type (#436) #219