More better error handling.