Attempt to add error reporting