Handle config correctly. Refs #810