diff --git a/components/freertos/tasks.c b/components/freertos/tasks.c
index 314f1477f9..4689138d06 100644
--- a/components/freertos/tasks.c
+++ b/components/freertos/tasks.c
@@ -637,8 +637,9 @@ void taskYIELD_OTHER_CORE( BaseType_t xCoreID, UBaseType_t uxPriority )
 	TCB_t *pxNewTCB;
 	TaskHandle_t xReturn;
 
-		configASSERT( pxStackBuffer != NULL );
-		configASSERT( pxTaskBuffer != NULL );
+		configASSERT( portVALID_TCB_MEM(pxTaskBuffer) );
+		configASSERT( portVALID_STACK_MEM(pxStackBuffer) );
+		configASSERT( (xCoreID>=0 && xCoreID<portNUM_PROCESSORS) || (xCoreID==tskNO_AFFINITY) );
 
 		#if( configASSERT_DEFINED == 1 )
 		{