In that case you cannot do anything else then to keep the former behavior to return early with null.