[TO_STAGE] - Adding warning message and fixing grep parameters