Fixing bug when the entry doesn't exists... it gave a long timeout and slowdown the server