#1633 Moved try/catch close to actual windows exception