Improved schema and pointer exception usage. Relates to #1.