Added missing return value, some additional logging.
Added missing return value, some additional logging.