Add missing return after error; fix wrong int-bool conversion