Handle void return type better