Added the exception throwing someone forgot + renamed two variables for better clarity. refs #386