handle null pointer exception

1 job for issue_2401 in 2 minutes and 38 seconds (queued for 1 second)