0.10.3 - catch more errors