Allow for empty or nil API version - second try