throw a more informative exception to track down TeamCity test failures
fixes for several dictionary lookups
Merge remote-tracking branch 'laimis/dictionary_fixes'