Fix for Cannot read property 'excludeFinished' of null