removed unneeded return statements
added checking for method existance