Fixed null pointer exception, & inv click