fix npe issue in advancing
Reviewer: Chezka Arevalo