Real fix for static linking + failure handling