Null address is no longer throwing