Added an additional client-side check before requesting flags. Couple of extra null checks to be safe.