Reduce code duplication, log bad pointers#2

tomsons26 wants to merge 2 commits intojonwil:masterjonwil/unlinkerida:masterfrom

tomsons26:mastertomsons26/unlinkerida:masterCopy head branch name to clipboard