Adding a null/None check