CodePCR 0002

Added catch statements for nullPointerException.  May need to be
investigated in the future if there is functional impact found for this
exception