Fix handeling null