Add caller info in assertion failure messages

Also added not nil assertion.