Added invalid location case