avoid null reference
fix space in error message
Merge branch 'master' of github.com:nikuuchi/Aspen into error_message