Fixed NRE in some cases
Merge branch 'FEAT_AddManualPath' into EXP_10AE_Update_1