Now we handle exception in a better way