Implement better handling for assumption failures due to NPE at affected instructor pages #2473

For Issue #2473