bugfixes
more verbose exception
bugfixes