Handled null pointer exception.
Fixes.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Fixed Elementary" tab in RUSD District library should be enabled
Merge pull request #1332 from anilgooru/dev-branch

fixes
Merge pull request #1333 from Gooru/dev-branch

fixes