Fix race condition & check for anormal values (#627) (#648)

Fix race condition & check for anormal values (#627) (#648) #156