(1) Updated test code and added several checks for null in application
code so that all JUnit tests pass without any failures or errors.