Merge "Add missing else statement" into nyc-dev