Fix for checking dataset id not empty