Commit fixes bug introduced by fix for ID#3600946 where an error case was missing braces, so it would always fail. Commit for Dan Gora