logging, error handling update