Chrisb/global rejection handler fix

Gets rid of local variable - uses global handler everywhere.