Fixes #42 - When null, current schema