Fix error introduced in 3f56c8f (#92)
Only catch NonFatal exceptions