Added null checks to institution semester