Click targeting added, amended uncaught nullpointer exception
Revert "Click targeting added, amended uncaught nullpointer exception"

This reverts commit a8be0c533943d56bb3dd7b7a26a685f20358a11d.