Changed assertion for null pointer
Merge branch 'master' into Issue2553
[2553] NPE in InstructorFeedbackAddAction