improved exception message
updates