Refinement of messages to avoid printing when not relevant