Fix #3376.
Add a sanity check; update some comments.
Merge branch 'tim/3376' into reql_admin