CLOUDIFY-2180 Fixed NPE on close()
Merge pull request #5 from itaifrenkel/master

CLOUDIFY-2180 Fixed NPE on close()