Added verification for nulls and other stuff

Signed-off-by: Ruben <rubentin@gmail.com>
Merge branch 'master' of https://github.com/unok-kun/HTFM