hmm, need a rethink on these exceptions

Change-Id: I0d91e142d719b946f65ed704b06371d00534ad78