Fixes more hardcoded strings
Fixes issue #48
Adds more args null checks