Dirty unused exception fixed