Added env variables check