Added more changes on collection count issue
Merge pull request #344 from skpcharles/master

Added more changes on collection count issue
Merge remote-tracking branch 'gooru/master'
*Fixed Null Pointer Exception in Classpage Event logs