Adding more foresee hacking
adding null check for hash