Added check for non existant row