Catching nullpointer to prevent issue (for now, TO FIX)