Added workaround for error sometimes being null