Added null-check
Merge branch 'master' of https://github.com/Maestro1337/ssha.git