Fixed null passed in for options across all methods #934