Added cmd flag
Fixed possible crash if garbage responce
Revert "Added cmd flag"

This reverts commit 55bdf81a4059f7f8a6b19caabc67a131aaad7bab.