Fixed a null pointer error.
Fixed missing Assertion.h.