I think the second option is better because:

1. It does not get removed in -O mode
2. It has much cleaner error message