Address a straggler buffer overflow, and add safeguard after test abort

Address a straggler buffer overflow, and add safeguard after test abort #36