Minor cleanup.
Removing unchecked exceptions.