CHECKOUT :: Minor Error Handling Fixes