Changes to imrpove erroring. Refs #9