BUG FIX : check null pointer
Merge branch 'master' of github.com:outel/uranus