Patches for check_nt crashes [sf#2731755] [#972]