Error Handling Fixes