Remove duplicated env condition check and invalid errorHandler API usage
Remove duplicated env condition check and invalid errorHandler API usage

labianchin/WatchMen,iloire/WatchMen,Cellington1/Status,plyo/watchmen,corinis/watchmen,Cellington1/Status,iloire/WatchMen,labianchin/WatchMen,antoligy/WatchMen,labianchin/WatchMen,corinis/watchmen,plyo/watchmen,corinis/watchmen,NotyIm/WatchMen,NotyIm/WatchMen,ravi/watchmen,NotyIm/WatchMen,ravi/watchmen,iloire/WatchMen,plyo/watchmen,antoligy/WatchMen,Cellington1/Status,ravi/watchmen