Avoiding NPE
Merge branch 'master' of github.com:idega/com.idega.block.school into course_test

* 'master' of github.com:idega/com.idega.block.school:
  Avoiding NPE
Refactoring