Added null pointer exception checks to some underlying controller method
parameters