Fixing error handling so improper commands / params errors are returned. Fix for #12