Remove exception test and improvement message