made excepts specific and added logging