Add better logging.