server: ensure all cases are handled, refs #746