Rethrow properly when exception is a plain string
Merge branch 'ejhernandez/fix-rethrow'

Conflicts:
	main/core/ChangeLog