Added board, fixed exception