Added some error detection in case no track is defined