Add additional and better logging.