Added some exceptions to make development debugging easier