Updated to handle null versions