Error handling has bugs now with these changes