Fix exceptions, remove RuntimeException