Added more guards on params for I and L commands