Fixing bug found by Alex's static analysis. [#64069366]
Merge pull request #807 from NREL/20140117_ETH_BugFixes

Fixing bug found by Alex's static analysis. [#64069366]