redux of an exception fix
Merge pull request #2549 from devoncarew/devoncarew_redux

redux of an exception fix