cleaned up exceptions