bundle: verify arguments more strictly