Added error handling
Added keybinding