Commit abd33d8 (Fri Feb 01 17:13:44 2013 -0500)
Author: Alex Rukhlin <arukhlin@microsoft.com>
Committer: Alex Rukhlin <arukhlin@microsoft.com>
-----------------------------------------------------------------
    Null exception in exception handler fixed.