Removed unchecked BuildException etc