Added stronger logging.