added temp err handling