I'll add null checks to the obligated fields