More Code Fixes

More code Fixes to provide more useful error messages in case of
problems. v 0.0.3