tweeked some error callbacks