Working better... but not if there is an error