Fixed mistakes - now should work and fail silently (don't want to bring down the server)