Bugfix: Check for options? before extending