Merge branch 'hotfix/fix_bugs_in_custom_tracks'
Check now for a null ID list which could still be used to call the method resulting in the null pointer exception.
Merge branch 'hotfix/fix_java_exec_setup_bug' into develop