Let's not have another fatal error due to a simple oversight right before a release...