Should fix common error we've been getting in the logs.