Clean up solution
Add object null parameter verification