Fix/catch non fatal

Catch NonFatal(ex) instead of Throwable. The change exhibited the problem in #226 that UnApply was not handled. This is now also fixed. review by @olhotak 

Closes #226