Squashed commit of the following:

commit 43069922afa8af3ec31e7548c9352f10d2482a73
Author: Jared Jurkiewicz <jared.jurkiewicz@gmail.com>
Date:   Fri Aug 15 13:15:54 2014 -0400

    Fix issue with target node check, make sure it isn't root/body, fixes #18222