diff --git a/libeplayer3/manager/audio.c b/libeplayer3/manager/audio.c
index 7dc1312..419da78 100644
--- a/libeplayer3/manager/audio.c
+++ b/libeplayer3/manager/audio.c
@@ -315,7 +315,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
 		}
 		case MANAGER_GETNAME:
 		{
-			if ((TrackCount > 0) && (CurrentTrack >= 0))
+			if ((TrackCount > 0) && (CurrentTrack >= 0) && (Tracks[CurrentTrack].Name != NULL ))
 			{
 				*((char **)argument) = (char *)strdup(Tracks[CurrentTrack].Name);
 			}
diff --git a/libeplayer3/manager/video.c b/libeplayer3/manager/video.c
index 35a8181..b6ebcff 100644
--- a/libeplayer3/manager/video.c
+++ b/libeplayer3/manager/video.c
@@ -251,7 +251,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
 		}
 		case MANAGER_GETENCODING:
 		{
-			if ((TrackCount > 0) && (CurrentTrack >= 0))
+			if ((TrackCount > 0) && (CurrentTrack >= 0) && (Tracks[CurrentTrack].Encoding != NULL ))
 			{
 				*((char **)argument) = (char *)strdup(Tracks[CurrentTrack].Encoding);
 			}
@@ -263,7 +263,7 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
 		}
 		case MANAGER_GETNAME:
 		{
-			if ((TrackCount > 0) && (CurrentTrack >= 0))
+			if ((TrackCount > 0) && (CurrentTrack >= 0) && (Tracks[CurrentTrack].Name != NULL ))
 			{
 				*((char **)argument) = (char *)strdup(Tracks[CurrentTrack].Name);
 			}