Task #1659 - be able to have unique handles, clean up messages for error