Check for val1 and val2 individually
Check for val1 and val2 individually

Part of #259. This prevents us from getting an otherwise unhandled
exception at least although it doesn't fix the whole problem.

SoundGoof/NIPAP,fredsod/NIPAP,fredsod/NIPAP,plajjan/NIPAP,ettrig/NIPAP,garberg/NIPAP,bbaja42/NIPAP,plajjan/NIPAP,SpriteLink/NIPAP,plajjan/NIPAP,SpriteLink/NIPAP,SoundGoof/NIPAP,ettrig/NIPAP,SpriteLink/NIPAP,plajjan/NIPAP,fredsod/NIPAP,garberg/NIPAP,bbaja42/NIPAP,SoundGoof/NIPAP,ettrig/NIPAP,garberg/NIPAP,bbaja42/NIPAP,ettrig/NIPAP,ettrig/NIPAP,SoundGoof/NIPAP,SpriteLink/NIPAP,SoundGoof/NIPAP,fredsod/NIPAP,garberg/NIPAP,fredsod/NIPAP,fredsod/NIPAP,bbaja42/NIPAP,garberg/NIPAP,garberg/NIPAP,SoundGoof/NIPAP,bbaja42/NIPAP,bbaja42/NIPAP,SpriteLink/NIPAP,SpriteLink/NIPAP,plajjan/NIPAP,ettrig/NIPAP,plajjan/NIPAP