harden all commands
Merge pull request #14 from daptiv/fix-bug4

harden all commands