Quick workaround for buggy error handling