Merge pull request #5 from netceler/master

Some code cleaning
Protection from Null pointers
Merge branch 'master' into launcher-hold-vm
Merge branch 'launcher-hold-vm' into configurable-wait-time
Merge branch 'configurable-wait-time' into revert-to-snapshot