secured call to Command
fixed guarding clauses
2.0.1