Catch NonFatal instead of Exception