Added error function to some more gets
Cleanup