fixes for flagless messages, better handling of errors