Try to address shutdown crash on Win 8