Moved parsing logging message to a better place