Removed static keyword from the methods and tidied up some exception messages