Fix for NPE/AOB error.
Updated report format.
Fixed NPE/AIOB error
Added TODO