Add a check to prevent rookie mistakes (cough MossyBlog cough)
Merge branch 'master' of http://github.com/GraniteTeam/Granite