Throwing exception: gone. You're right, it didn't really belong.

Second note: see below.