removed some error logging