No longer panics when you supply incorrect arguments

Fixes ZEN-12187