Add some checks. Refs #386