Raise the exception not the type
Merge branch 'ip_address'

Conflicts:
	quark/plugin.py