Added Check for null with Jokers