Not a fan of a null possibly leaving from here... Option?