API Null fixed. And logging.