!Zap and Zero Page

I have a version of !zap that many moons ago Chris Gransden and myself (mainly bug reports from Chris) developed for zero page protection.
I have tried it on the latest build of the ROM , and the !ZeroPain log shows no errors directly from a quick run and load stuff from !Zap.
The following is from boot on a B+

Time: Sat Jul 11 09:39:04 2015
Location: Offset 00004764 in module BASIC
Current Wimp task: PDumperGP
Last app to start: BASIC -quit <Obey$Dir>.card

R0 = 00000004 R1 = 00000000 R2 = 00000004 R3 = 0000006e
R4 = 00008f39 R5 = 00000000 R6 = 00008f3d R7 = 0000003d
R8 = 00008700 R9 = 00000004 R10 = 0000000d R11 = 00008f3d
R12 = 00008f32 R13 = 000a7fcc R14 = fc1a5500 R15 = fc1a6584
DFAR = 00000004 Mode USR32 Flags nZCv if PSR = 60000110

fc1a653c : 11a02182 : MOVNE R2,R2,LSL #3
fc1a6540 : 11a00230 : MOVNE R0,R0,LSR R2
fc1a6544 : 12623020 : RSBNE R3,R2,#&20 ; =" "
fc1a6548 : 11800311 : ORRNE R0,R0,R1,LSL R3
fc1a654c : 11a01231 : MOVNE R1,R1,LSR R2
fc1a6550 : e21110ff : ANDS R1,R1,#&FF ; =“ÿ”
fc1a6554 : 03300000 : TEQEQ R0,#0
fc1a6558 : e2003102 : AND R3,R0,#&80000000
fc1a655c : 13800102 : ORRNE R0,R0,#&80000000
fc1a6560 : e3b09102 : MOVS R9,#&80000000
fc1a6564 : e1a0f00e : MOV PC,R14
fc1a6568 : e5d00000 : LDRB R0,[R0,#0]
fc1a656c : e3b09101 : MOVS R9,#&40000000
fc1a6570 : e1a0f00e : MOV PC,R14
fc1a6574 : e2101003 : ANDS R1,R0,#3
fc1a6578 : e3c02003 : BIC R2,R0,#3
fc1a657c * 05900000 * LDREQ R0,[R0,#0]
fc1a6580 : 18920005 : LDMNEIA R2,{R0,R2}
fc1a6584 : 11a01181 : MOVNE R1,R1,LSL #3
fc1a6588 : 11a00130 : MOVNE R0,R0,LSR R1
fc1a658c : 12611020 : RSBNE R1,R1,#&20 ; =" "
fc1a6590 : 11800112 : ORRNE R0,R0,R2,LSL R1
fc1a6594 : e3b09101 : MOVS R9,#&40000000
fc1a6598 : e1a0f00e : MOV PC,R14
fc1a659c : 0a00000e : BEQ &FC1A65DC
fc1a65a0 : e3590c01 : CMP R9,#&0100 ; =256
fc1a65a4 : 2a00316c : BCS &FC1B2B5C
fc1a65a8 : e2482c06 : SUB R2,R8,#&0600 ; =1536
fc1a65ac : e2823c01 : ADD R3,R2,#&0100 ; =256
fc1a65b0 : e2833001 : ADD R3,R3,#1
fc1a65b4 : e4d01001 : LDRB R1,[R0],#1
fc1a65b8 : e4c21001 : STRB R1,[R2],#1

Time: Sat Jul 11 09:39:32 2015
Location: Offset 00000790 in module International
Current Wimp task: Zap
Last app to start: Zap

R0 = 0000004c R1 = 00000043 R2 = 00000000 R3 = 00000000
R4 = 00000000 R5 = 00000003 R6 = fc259f76 R7 = 00000000
R8 = 0002e70c R9 = fc259920 R10 = 00000043 R11 = fb41c980
R12 = fb406dd4 R13 = fa207fbc R14 = fc019934 R15 = fc259c58
DFAR = 00000000 Mode SVC32 Flags nzcv if PSR = 00000113

fc259c10 : 65246523 : STRVS R6,[R4,#-1315]!
fc259c14 : 6e316530 : MRCVS CP5,1,R6,C1,C0,1
fc259c18 : 6f356f32 : SWIVS &356F32
fc259c1c : 65336f36 : LDRVS R6,[R3,#-3894]!
fc259c20 : 65466534 : STRVSB R6,[R6,#-1332]
fc259c24 : 65506547 : LDRVSB R6,[R0,#-1351]
fc259c28 : 67526651 : Undefined instruction
fc259c2c : 69546853 : LDMVSDB R4,{R0,R1,R4,R6,R11,R13,R14}^
fc259c30 : 6c576b56 : MRRCVS CP11,5,R6,R7,C6 ; ARMv5TE or later
fc259c34 : 00006d58 : ANDEQ R6,R0,R8,ASR R13
fc259c38 : e92d4065 : STMDB R13!,{R0,R2,R5,R6,R14}
fc259c3c : e28f6e1d : ADR R6,&FC259E14
fc259c40 : e1a02003 : MOV R2,R3
fc259c44 : e4d60001 : LDRB R0,[R6],#1
fc259c48 : e3300000 : TEQ R0,#0
fc259c4c : 08bd8065 : LDMEQIA R13!,{R0,R2,R5,R6,PC}
fc259c50 * e4d25001 * LDRB R5,[R2],#1
fc259c54 : e3550020 : CMP R5,#&20 ; =" "
fc259c58 : 9a000011 : BLS &FC259CA4
fc259c5c : e335002e : TEQ R5,#&2E ; =“.”
fc259c60 : 0a000009 : BEQ &FC259C8C
fc259c64 : e0255000 : EOR R5,R5,R0
fc259c68 : e3d55020 : BICS R5,R5,#&20 ; =" "
fc259c6c : 1a00000c : BNE &FC259CA4
fc259c70 : e4d60001 : LDRB R0,[R6],#1
fc259c74 : e3300000 : TEQ R0,#0
fc259c78 : 1afffff4 : BNE &FC259C50
fc259c7c : e5d25000 : LDRB R5,[R2,#0]
fc259c80 : e3550020 : CMP R5,#&20 ; =" "
fc259c84 : 8a000009 : BHI &FC259CB0
fc259c88 : ea000002 : B &FC259C98
fc259c8c : e4d60001 : LDRB R0,[R6],#1

The International module error is then repeated many times…
Other registers do vary, but R2 is always zero.
If anyone would like to try it a bit more in anger just email me webmaster@tankstage.co.uk and I’ll send a copy.

Location: Offset 00000790 in module International

Someone (Zap itself?) has done Service_International 0 (convert country name to number) with a NULL pointer for the name.

Thanks Sprow.. Got that one now it seems.