Removed unneeded exception; added logging