Some More Error Proofing