* Restore Balance - Fixed possible null pointer exception.
Merge origin/master