Merge "Handle non-valid HEAD"