change exception raise message + remove 'begin-end' block