Fixed Another Exception Related to #17

Fixed missing logic in the Scoreboard to fix the Unhandled Exceptions
plus fixed an additional exception found in Controller. Added some
braces white-spacing in Scoreboard just for you, Nick. :P