Added more NULL checks for col O