No longer panics when you supply incorrect arguments
Merge pull request #755 from control-center/bugfix/ZEN-12187

No longer panics when you supply incorrect arguments