Adapt to when there is no phase (e.g. 'rc')

Change-Id: If7dc74501e4a5001e645a857d21f545db89994ae