Merge pull request #931 from luke-jr/dbg_loaderr