Fixed NPE error in client error reporting resource
Changes for project modularisation