Remove a bunch of unneeded exceptions in export code

Change-Id: I56c524bf187462a0bc28f7e03f53b5e53ec8fc01