2010-03-18 insilmaril Added missing return values