Add null check for safety
Add potential safeguards for DJ de-sync