add the zone exception handling to the polymer version

@terrylucas Fix issues w/ the polymer version introduced by my last CL.