exceptions fixes