Fixed NoneType on exclude