Started adding null argument catching.
Removed null argument catching
Added null arument tests