Fixes #31: More specific error messages