Better handling of Null variables