Scala sanity upgrades - 2.10
Actually fix exception this time