Expand invalid location logic