Merge branch 'improve-error-checking'