Fix issue with Firebase and null values