Added contracts
Merge branch 'master' of https://github.com/KrisTo-Corp/ESS.git
Added NULL checks