Fixed NPE
Reverted utils method
Merge pull request #132 from ojwanganto/REPORTS-2200

Reports 2200