Fixed callback-error catching