Cleanup, re-implement null pointer fix when no AdListener set.