Expand checks for bad IDs